Merge pull request eclipse-omr#7452 from a7ehuo/PR-valuetypes-null-re…

…stricted-array Fix null restricted array related issues for value types
hzongaro · Oct 21, 2024 · 8031543 · 8031543
2 parents 18d8727 + 833607b
commit 8031543
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 52 deletions.
diff --git a/compiler/env/FrontEnd.cpp b/compiler/env/FrontEnd.cpp
@@ -187,6 +187,13 @@ TR_FrontEnd::getArrayClassFromComponentClass(TR_OpaqueClassBlock * componentClas
    return 0;
    }
 
+TR_OpaqueClassBlock *
+TR_FrontEnd::getNullRestrictedArrayClassFromComponentClass(TR_OpaqueClassBlock * componentClass)
+   {
+   TR_UNIMPLEMENTED();
+   return 0;
+   }
+
 TR_OpaqueClassBlock *
 TR_FrontEnd::getLeafComponentClassFromArrayClass(TR_OpaqueClassBlock *arrayClass)
    {

diff --git a/compiler/env/FrontEnd.hpp b/compiler/env/FrontEnd.hpp
@@ -181,6 +181,16 @@ class TR_FrontEnd : private TR::Uncopyable
 
    // VM+Shared
    virtual TR_OpaqueClassBlock * getArrayClassFromComponentClass(TR_OpaqueClassBlock * componentClass);
+   /** \brief
+    *     Retrieves the nullRestrictedArrayClass from the array component class.
+    *
+    *  \param componentClass
+    *     The array component class
+    *
+    *  \return
+    *     A pointer to nullRestrictedArrayClass if it exists, otherwise NULL
+    */
+   virtual TR_OpaqueClassBlock * getNullRestrictedArrayClassFromComponentClass(TR_OpaqueClassBlock * componentClass);
    virtual TR_OpaqueClassBlock * getClassFromNewArrayType(int32_t arrayType);
    virtual TR_OpaqueClassBlock * getClassFromSignature(const char * sig, int32_t length, TR_ResolvedMethod *method, bool callSiteVettedForAOT=false);
    virtual TR_OpaqueClassBlock * getClassFromSignature(const char * sig, int32_t length, TR_OpaqueMethodBlock *method, bool callSiteVettedForAOT=false);

diff --git a/compiler/optimizer/OMRValuePropagation.cpp b/compiler/optimizer/OMRValuePropagation.cpp
@@ -1690,7 +1690,7 @@ TR_YesNoMaybe OMR::ValuePropagation::isCastClassObject(TR::VPClassType *type)
    }
 
 
-TR_YesNoMaybe OMR::ValuePropagation::isArrayCompTypePrimitiveValueType(TR::VPConstraint *arrayConstraint)
+TR_YesNoMaybe OMR::ValuePropagation::isArrayNullRestricted(TR::VPConstraint *arrayConstraint)
    {
    return TR::Compiler->om.areFlattenableValueTypesEnabled() ? TR_maybe : TR_no;
    }

diff --git a/compiler/optimizer/OMRValuePropagation.hpp b/compiler/optimizer/OMRValuePropagation.hpp
@@ -367,14 +367,14 @@ class ValuePropagation : public TR::Optimization
    TR_YesNoMaybe isCastClassObject(TR::VPClassType *type);
 
    /**
-    * Determine whether the component type of an array is, or might be, a primitive value
-    * type.
+    * Determine whether the array is, or might be, null-restricted
+    *
     * \param arrayConstraint The \ref TR::VPConstraint type constraint for the array reference
-    * \returns \c TR_yes if the array's component type is definitely a primitive value type;\n
-    *          \c TR_no if it is definitely not a primitive value type; or\n
+    * \returns \c TR_yes if the array is definitely a null-restricted array;\n
+    *          \c TR_no if it is definitely not a null-restricted array; or\n
     *          \c TR_maybe otherwise.
     */
-   virtual TR_YesNoMaybe isArrayCompTypePrimitiveValueType(TR::VPConstraint *arrayConstraint);
+   virtual TR_YesNoMaybe isArrayNullRestricted(TR::VPConstraint *arrayConstraint);
 
    /**
     * \brief
@@ -616,15 +616,16 @@ class ValuePropagation : public TR::Optimization
      {
      TR_ALLOC(TR_Memory::ValuePropagation)
 
-     TR_NeedRuntimeTestNullRestrictedArrayCopy(TR::Node *dstArrRef, TR::Node *srcArrRef,
+     TR_NeedRuntimeTestNullRestrictedArrayCopy(TR::SymbolReference *dstArrRefSymRef, TR::SymbolReference *srcArrRefSymRef,
                                                TR::TreeTop *ptt, TR::TreeTop *ntt,
                                                TR::Block *originBlock, TR::Block *slowBlock,
                                                bool testDstArray)
-        : _dstArrayRefNode(dstArrRef),  _srcArrayRefNode(srcArrRef), _prevTT(ptt), _nextTT(ntt), _originBlock(originBlock), _slowBlock(slowBlock), _needRuntimeTestDstArray(testDstArray)
+        : _dstArrRefSymRef(dstArrRefSymRef), _srcArrRefSymRef(srcArrRefSymRef), _prevTT(ptt), _nextTT(ntt),
+          _originBlock(originBlock), _slowBlock(slowBlock), _needRuntimeTestDstArray(testDstArray)
         {}
 
-     TR::Node *_dstArrayRefNode;
-     TR::Node *_srcArrayRefNode;
+     TR::SymbolReference * _dstArrRefSymRef;
+     TR::SymbolReference * _srcArrRefSymRef;
 
      TR::TreeTop *_prevTT;
      TR::TreeTop *_nextTT;
-Original file line number
+Diff line change
@@ Expand Up @@
        }
-    TR_YesNoMaybe OMR::ValuePropagation::isArrayCompTypePrimitiveValueType(TR::VPConstraint *arrayConstraint)
+    TR_YesNoMaybe OMR::ValuePropagation::isArrayNullRestricted(TR::VPConstraint *arrayConstraint)
        {
        return TR::Compiler->om.areFlattenableValueTypesEnabled() ? TR_maybe : TR_no;
        }
@@ Expand Down @@