Merge pull request #13715 from CarolEidt/LsraInfoInLsra
authorCarol Eidt <carol.eidt@microsoft.com>
Tue, 12 Sep 2017 17:26:49 +0000 (10:26 -0700)
committerGitHub <noreply@github.com>
Tue, 12 Sep 2017 17:26:49 +0000 (10:26 -0700)
Do TreeNodeInfoInit in buildIntervals

1  2 
src/jit/codegenlinear.cpp
src/jit/lower.cpp
src/jit/lsra.cpp
src/jit/lsraarm.cpp
src/jit/lsraarm64.cpp
src/jit/lsraxarch.cpp

Simple merge
Simple merge
Simple merge
@@@ -767,14 -766,12 +767,18 @@@ void LinearScan::TreeNodeInfoInit(GenTr
                  unreached();
              }
              break;
 +
 +        case GT_INDEX_ADDR:
 +            info->srcCount         = 2;
 +            info->dstCount         = 1;
 +            info->internalIntCount = 1;
 +            break;
      } // end switch (tree->OperGet())
  
+     if (tree->IsUnusedValue() && (info->dstCount != 0))
+     {
+         info->isLocalDefUse = true;
+     }
      // We need to be sure that we've set info->srcCount and info->dstCount appropriately
      assert((info->dstCount < 2) || tree->IsMultiRegNode());
  }
@@@ -660,14 -659,12 +660,18 @@@ void LinearScan::TreeNodeInfoInit(GenTr
              assert((tree->gtFlags & (GTF_VAR_DEF | GTF_VAR_USEASG)) == 0);
              info->internalIntCount = 1;
              break;
 +
 +        case GT_INDEX_ADDR:
 +            info->srcCount         = 2;
 +            info->dstCount         = 1;
 +            info->internalIntCount = 1;
 +            break;
      } // end switch (tree->OperGet())
  
+     if (tree->IsUnusedValue() && (info->dstCount != 0))
+     {
+         info->isLocalDefUse = true;
+     }
      // We need to be sure that we've set info->srcCount and info->dstCount appropriately
      assert((info->dstCount < 2) || tree->IsMultiRegCall());
  }
Simple merge