Merge pull request #7277 from rmnattas/unsafe-checkTR_DisableUnsafe

Check TR_DisableUnsafe before transforming Unsafe copyMemory & setMemory
eclipse-openj9 · Feb 29, 2024 · bf5fa84 · bf5fa84
2 parents 9235a2f + c75d6d2
commit bf5fa84
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/compiler/compile/OMRCompilation.cpp b/compiler/compile/OMRCompilation.cpp
@@ -1674,6 +1674,7 @@ bool OMR::Compilation::canTransformUnsafeCopyToArrayCopy()
    {
    if (!self()->getOptions()->realTimeGC() &&
        !TR::Compiler->om.canGenerateArraylets() &&
+       !self()->getOption(TR_DisableUnsafe) &&
        self()->cg()->canTransformUnsafeCopyToArrayCopy())
       return true;
 
@@ -1684,6 +1685,7 @@ bool OMR::Compilation::canTransformUnsafeSetMemory()
    {
    if (!self()->getOptions()->realTimeGC() &&
        !TR::Compiler->om.canGenerateArraylets() &&
+       !self()->getOption(TR_DisableUnsafe) &&
        self()->cg()->canTransformUnsafeSetMemory())
       return true;