Merge pull request #12423 from CarolEidt/ContainDoNotEnreg
authorCarol Eidt <carol.eidt@microsoft.com>
Tue, 27 Jun 2017 00:25:55 +0000 (17:25 -0700)
committerGitHub <noreply@github.com>
Tue, 27 Jun 2017 00:25:55 +0000 (17:25 -0700)
Mark lvDoNotEnregister lclVars as contained

1  2 
src/jit/lclvars.cpp
src/jit/lower.cpp
src/jit/lsra.cpp

@@@ -3293,8 -3305,12 +3306,13 @@@ void Compiler::lvaSortByRefCount(
          else if (opts.MinOpts() && !JitConfig.JitMinOptsTrackGCrefs() && varTypeIsGC(varDsc->TypeGet()))
          {
              varDsc->lvTracked = 0;
+             lvaSetVarDoNotEnregister(lclNum DEBUGARG(DNER_MinOptsGC));
+         }
+         else if ((opts.compFlags & CLFLG_REGVAR) == 0)
+         {
+             lvaSetVarDoNotEnregister(lclNum DEBUGARG(DNER_NoRegVars));
          }
 +#endif // !defined(JIT32_GCENCODER) || !defined(LEGACY_BACKEND)
  #if defined(JIT32_GCENCODER) && defined(WIN64EXCEPTIONS)
          else if (lvaIsOriginalThisArg(lclNum) && (info.compMethodInfo->options & CORINFO_GENERICS_CTXT_FROM_THIS) != 0)
          {
Simple merge
Simple merge