Match all 3 sizes

dotnet · Jun 5, 2019 · f100c7d · f100c7d
1 parent a9ea4f1
commit f100c7d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/jit/copyprop.cpp b/src/jit/copyprop.cpp
@@ -495,9 +495,11 @@ void Compiler::optCopyPropFoldCopyBlks(BasicBlock* block)
             prevDst = prevDst->AsIndir()->Addr()->gtGetOp1();
         }
 
+        GenTreeLclVarCommon* prevSrcLclVar = nullptr;
         GenTreeLclVarCommon* prevDstLclVar = nullptr;
         if (prevDst->OperGet() == GT_LCL_VAR || prevDst->OperGet() == GT_LCL_FLD)
         {
+            prevSrcLclVar = &prevSrc->gtLclVarCommon;
             prevDstLclVar = &prevDst->gtLclVarCommon;
         }
         else
@@ -508,6 +510,7 @@ void Compiler::optCopyPropFoldCopyBlks(BasicBlock* block)
 
         assert(currSrcLclVar != nullptr);
         assert(currDstLclVar != nullptr);
+        assert(prevSrcLclVar != nullptr);
         assert(prevDstLclVar != nullptr);
 
         if (prevDstLclVar->gtLclNum != currSrcLclVar->gtLclNum)
@@ -519,7 +522,8 @@ void Compiler::optCopyPropFoldCopyBlks(BasicBlock* block)
         unsigned lclNum    = prevDstLclVar->gtLclNum;
         unsigned newLclNum = currDstLclVar->gtLclNum;
 
-        if (lvaLclSize(lclNum) != lvaLclSize(newLclNum))
+        if (lvaLclExactSize(lclNum) != lvaLclExactSize(prevSrcLclVar->gtLclNum) ||
+            lvaLclExactSize(newLclNum) != lvaLclExactSize(currSrcLclVar->gtLclNum))
         {
             // Don't propergate if they aren't the same size
             continue;
@@ -763,7 +767,7 @@ void Compiler::optCopyPropThroughCopyBlk(BasicBlock* block)
         unsigned lclNum    = nextLclVar->gtLclNum;
         unsigned newLclNum = currSrcLclVar->gtLclNum;
 
-        if (lvaLclSize(lclNum) != lvaLclSize(newLclNum))
+        if (lvaLclExactSize(lclNum) != lvaLclExactSize(newLclNum))
         {
             // Don't propergate if they aren't the same size
             continue;