Remember to handle IsRegOptional

dotnet · Sep 28, 2022 · c3515a8 · c3515a8
1 parent 94e17ab
commit c3515a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp
@@ -1057,19 +1057,6 @@ bool CodeGen::genCreateAddrMode(
         op2 = addr->AsOp()->gtOp2;
     }
 
-#if TARGET_ARM64
-    if (op2->OperIsLIR() && op2->isContained() && op2->OperIs(GT_CAST))
-    {
-        *rv1Ptr = op1;
-        *rv2Ptr = op2;
-        *mulPtr = 1;
-        *cnsPtr = 0;
-        *revPtr = false; // op2 is never a gc type
-        assert(!varTypeIsGC(op2));
-        return true;
-    }
-#endif
-
     // Can't use indirect addressing mode as we need to check for overflow.
     // Also, can't use 'lea' as it doesn't set the flags.
 

diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp
@@ -288,7 +288,7 @@ bool Lowering::IsContainableBinaryOp(GenTree* parentNode, GenTree* childNode) co
         // Find "a op cast(b)"
         GenTree* castOp = childNode->AsCast()->CastOp();
 
-        if (castOp->isContained())
+        if (castOp->isContained() || castOp->IsRegOptional())
         {
             // Cannot contain if the childs op1 is already contained
             return false;