Simplify optIsSsaLocal

dotnet · Jan 13, 2022 · db9a3f9 · db9a3f9
1 parent 4011712
commit db9a3f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -7374,7 +7374,7 @@ class Compiler
     void optCopyProp(Statement* stmt, GenTreeLclVarCommon* tree, unsigned lclNum, LclNumToGenTreePtrStack* curSsaName);
     void optBlockCopyPropPopStacks(BasicBlock* block, LclNumToGenTreePtrStack* curSsaName);
     void optBlockCopyProp(BasicBlock* block, LclNumToGenTreePtrStack* curSsaName);
-    unsigned optIsSsaLocal(GenTree* tree);
+    unsigned optIsSsaLocal(GenTreeLclVarCommon* lclNode);
     int optCopyProp_LclVarScore(LclVarDsc* lclVarDsc, LclVarDsc* copyVarDsc, bool preferOp2);
     void optVnCopyProp();
     INDEBUG(void optDumpCopyPropStack(LclNumToGenTreePtrStack* curSsaName));

diff --git a/src/coreclr/jit/copyprop.cpp b/src/coreclr/jit/copyprop.cpp
@@ -256,23 +256,17 @@ void Compiler::optCopyProp(Statement*               stmt,
 // optIsSsaLocal : helper to check if the tree is a local that participates in SSA numbering.
 //
 // Arguments:
-//    tree        -  The tree to perform the check on;
+//    lclNode - The local tree to perform the check on;
 //
 // Returns:
 //    - lclNum if the local is participating in SSA;
 //    - fieldLclNum if the parent local can be replaced by its only field;
 //    - BAD_VAR_NUM otherwise.
 //
-unsigned Compiler::optIsSsaLocal(GenTree* tree)
+unsigned Compiler::optIsSsaLocal(GenTreeLclVarCommon* lclNode)
 {
-    if (!tree->IsLocal())
-    {
-        return BAD_VAR_NUM;
-    }
-
-    GenTreeLclVarCommon* lclNode = tree->AsLclVarCommon();
-    unsigned             lclNum  = lclNode->GetLclNum();
-    LclVarDsc*           varDsc  = lvaGetDesc(lclNum);
+    unsigned   lclNum = lclNode->GetLclNum();
+    LclVarDsc* varDsc = lvaGetDesc(lclNum);
 
     if (!lvaInSsa(lclNum) && varDsc->CanBeReplacedWithItsField(this))
     {
@@ -343,7 +337,7 @@ void Compiler::optBlockCopyProp(BasicBlock* block, LclNumToGenTreePtrStack* curS
             // TODO-CQ: propagate on LCL_FLDs too.
             else if (tree->OperIs(GT_LCL_VAR) && ((tree->gtFlags & GTF_VAR_DEF) == 0))
             {
-                const unsigned lclNum = optIsSsaLocal(tree);
+                const unsigned lclNum = optIsSsaLocal(tree->AsLclVarCommon());
 
                 if (lclNum == BAD_VAR_NUM)
                 {