Merge pull request #6 from jakobbotsch/stack-allocate-unescaped-boxes…

…-lclmorph Minor fixes
AndyAyersMS · Jun 12, 2024 · 5a08c84 · 5a08c84
2 parents 56500c3 + 67402d4
commit 5a08c84
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/src/coreclr/jit/lclmorph.cpp b/src/coreclr/jit/lclmorph.cpp
@@ -1033,34 +1033,30 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>
                 assert(TopValue(1).Node() == node->AsOp()->gtOp1);
                 assert(TopValue(0).Node() == node->AsOp()->gtOp2);
 
-                GenTree* op1 = node->AsOp()->gtOp1;
-                GenTree* op2 = node->AsOp()->gtOp2;
-                bool rewrite = false;
+                Value& lhs = TopValue(1);
+                Value& rhs = TopValue(0);
 
-                if (op1->OperIs(GT_LCL_ADDR) && op2->IsIntegralConst(0))
+                if ((lhs.IsAddress() && rhs.Node()->IsIntegralConst(0)) ||
+                    (rhs.IsAddress() && lhs.Node()->IsIntegralConst(0)))
                 {
-                    op1 = m_compiler->gtNewIconNode(1);
-                    op2->ChangeType(TYP_INT);
-                    rewrite = true;
-                }
-                else if (op2->OperIs(GT_LCL_ADDR) && op1->IsIntegralConst(0))
-                {
-                    op2 = m_compiler->gtNewIconNode(1);
-                    op1->ChangeType(TYP_INT);
-                    rewrite = true;
-                }
+                    JITDUMP("Rewriting known address-of comparison [%06u]\n", m_compiler->dspTreeID(node));
+                    *lhs.Use() = m_compiler->gtNewIconNode(0);
+                    *rhs.Use() = m_compiler->gtNewIconNode(1);
+                    m_stmtModified = true;
 
-                if (rewrite)
+                    INDEBUG(TopValue(0).Consume());
+                    INDEBUG(TopValue(1).Consume());
+                    PopValue();
+                    PopValue();
+                }
+                else
                 {
-                    JITDUMP("Rewriting known address-of comparison [%06u]\n", m_compiler->dspTreeID(node));
-                    node->AsOp()->gtOp1 = op1;
-                    node->AsOp()->gtOp2 = op2;
+                    EscapeValue(TopValue(0), node);
+                    PopValue();
+                    EscapeValue(TopValue(0), node);
+                    PopValue();
                 }
 
-                INDEBUG(TopValue(0).Consume());
-                INDEBUG(TopValue(1).Consume());
-                PopValue();
-                PopValue();
                 break;
             }
 

diff --git a/src/coreclr/jit/lclvars.cpp b/src/coreclr/jit/lclvars.cpp
@@ -2550,6 +2550,7 @@ bool Compiler::StructPromotionHelper::CanPromoteStructVar(unsigned lclNum)
     if (varDsc->lvStackAllocatedBox)
     {
         JITDUMP("  struct promotion of V%02u is disabled because it is a stack allocated box\n", lclNum);
+        return false;
     }
 
 #ifdef SWIFT_SUPPORT