JIT: Handle LCL_ADDR in TreeLifeUpdater

src/coreclr/jit/async.cpp

@@ -469,7 +469,7 @@ void AsyncLiveness::StartBlock(BasicBlock* block)
 //
 void AsyncLiveness::Update(GenTree* node)
 {
-    m_updater.UpdateLife(node);
+    m_updater.UpdateLife<true>(node);
 }
 
 //------------------------------------------------------------------------

src/coreclr/jit/codegencommon.cpp

@@ -591,7 +591,7 @@ void CodeGen::genMarkLabelsForCodegen()
 
 void CodeGenInterface::genUpdateLife(GenTree* tree)
 {
-    treeLifeUpdater->UpdateLife(tree);
+    treeLifeUpdater->UpdateLife<false>(tree);
 }
 
 void CodeGenInterface::genUpdateLife(VARSET_VALARG_TP newLife)

src/coreclr/jit/copyprop.cpp

@@ -404,7 +404,7 @@ bool Compiler::optBlockCopyProp(BasicBlock* block, LclNumToLiveDefsMap* curSsaNa
         // SSA renaming process.
         for (GenTree* const tree : stmt->TreeList())
         {
-            treeLifeUpdater.UpdateLife(tree);
+            treeLifeUpdater.UpdateLife<false>(tree);
 
             if (tree->OperIsSsaDef())
             {

src/coreclr/jit/treelifeupdater.cpp

@@ -285,6 +285,7 @@ void TreeLifeUpdater<ForCodeGen>::UpdateLifeVar(GenTree* tree, GenTreeLclVarComm
 //    tree - the tree which effect on liveness is processed.
 //
 template <bool ForCodeGen>
+template <bool GeneralLclAddrHandling>
 void TreeLifeUpdater<ForCodeGen>::UpdateLife(GenTree* tree)
 {
     assert(m_compiler->GetCurLVEpoch() == epoch);
@@ -299,7 +300,7 @@ void TreeLifeUpdater<ForCodeGen>::UpdateLife(GenTree* tree)
     {
         UpdateLifeVar(tree, tree->AsLclVarCommon());
     }
-    else if (tree->OperIsIndir() && tree->AsIndir()->Addr()->OperIs(GT_LCL_ADDR))
+    else if (!GeneralLclAddrHandling && tree->OperIsIndir() && tree->AsIndir()->Addr()->OperIs(GT_LCL_ADDR))
     {
         UpdateLifeVar(tree, tree->AsIndir()->Addr()->AsLclVarCommon());
     }
@@ -311,6 +312,10 @@ void TreeLifeUpdater<ForCodeGen>::UpdateLife(GenTree* tree)
         };
         tree->VisitLocalDefNodes(m_compiler, visitDef);
     }
+    else if (GeneralLclAddrHandling && tree->OperIs(GT_LCL_ADDR))
+    {
+        UpdateLifeVar(tree, tree->AsLclVarCommon());
+    }
 }
 
 //------------------------------------------------------------------------
@@ -405,3 +410,6 @@ void TreeLifeUpdater<ForCodeGen>::DumpLifeDelta(GenTree* tree)
 
 template class TreeLifeUpdater<true>;
 template class TreeLifeUpdater<false>;
+template void TreeLifeUpdater<false>::UpdateLife<false>(GenTree*);
+template void TreeLifeUpdater<false>::UpdateLife<true>(GenTree*);
+template void TreeLifeUpdater<true>::UpdateLife<false>(GenTree*);

src/coreclr/jit/treelifeupdater.h

@@ -13,6 +13,7 @@ class TreeLifeUpdater
 {
 public:
     TreeLifeUpdater(Compiler* compiler);
+    template <bool GeneralLclAddrHandling>
     void UpdateLife(GenTree* tree);
     bool UpdateLifeFieldVar(GenTreeLclVar* lclNode, unsigned multiRegIndex);