Copy propagate on LCL_FLDs (#68592)

dotnet · May 11, 2022 · 9158543 · 9158543
1 parent 52fd1a5
commit 9158543
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/coreclr/jit/copyprop.cpp b/src/coreclr/jit/copyprop.cpp
@@ -205,15 +205,18 @@ void Compiler::optCopyProp(Statement* stmt, GenTreeLclVarCommon* tree, unsigned
  continue;
  }
 
- var_types newLclType = newLclVarDsc->TypeGet();
- if (!newLclVarDsc->lvNormalizeOnLoad())
+ if (tree->OperIs(GT_LCL_VAR))
  {
- newLclType = genActualType(newLclType);
- }
+ var_types newLclType = newLclVarDsc->TypeGet();
+ if (!newLclVarDsc->lvNormalizeOnLoad())
+ {
+ newLclType = genActualType(newLclType);
+ }
 
- if (newLclType != tree->TypeGet())
- {
- continue;
+ if (newLclType != tree->TypeGet())
+ {
+ continue;
+ }
  }
 
 #ifdef DEBUG
@@ -388,8 +391,7 @@ void Compiler::optBlockCopyProp(BasicBlock* block, LclNumToLiveDefsMap* curSsaNa
 
  optCopyPropPushDef(tree, lclDefNode, lclNum, curSsaName);
  }
- // TODO-CQ: propagate on LCL_FLDs too.
- else if (tree->OperIs(GT_LCL_VAR) && ((tree->gtFlags & GTF_VAR_DEF) == 0))
+ else if (tree->OperIs(GT_LCL_VAR, GT_LCL_FLD) && ((tree->gtFlags & GTF_VAR_DEF) == 0))
  {
  const unsigned lclNum = optIsSsaLocal(tree->AsLclVarCommon());
 

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
@@ -8136,7 +8136,7 @@ GenTree* Compiler::gtCloneExpr(
  new (this, GT_LCL_FLD) GenTreeLclFld(GT_LCL_FLD, tree->TypeGet(), tree->AsLclFld()->GetLclNum(),
  tree->AsLclFld()->GetLclOffs());
  copy->AsLclFld()->SetFieldSeq(tree->AsLclFld()->GetFieldSeq());
- copy->gtFlags = tree->gtFlags;
+ copy->AsLclFld()->SetSsaNum(tree->AsLclFld()->GetSsaNum());
  }
  goto DONE;