Merge branch 'master' into fmt-bb

diff --cc src/jit/assertionprop.cpp
Simple merge

diff --cc src/jit/codegenarm.cpp
Simple merge

diff --cc src/jit/codegenarm64.cpp
Simple merge

diff --cc src/jit/compiler.cpp
Simple merge

diff --cc src/jit/emitxarch.cpp
Simple merge

diff --cc src/jit/lclvars.cpp
Simple merge

diff --cc src/jit/morph.cpp
Simple merge

diff --cc src/jit/ssabuilder.cpp
index 19b7405cda15b639c83f6eaf77f3e1ac97d9bf95,c5fc7a70a861be903b346d76b0d6743b7b83bbad..b4bb8afa67d40d3b235fbf09ec64f082e4b1eb6c
--- 1/src/jit/ssabuilder.cpp
--- 2/src/jit/ssabuilder.cpp
+++ b/src/jit/ssabuilder.cpp
@@@ -1186,11 -1157,11 +1159,11 @@@ void SsaBuilder::BlockRenameVariables(B
              // Is there an Phi definition for memoryKind at the start of this block?
              if (block->bbMemorySsaPhiFunc[memoryKind] != nullptr)
              {
-                 unsigned count = pRenameState->CountForMemoryDef();
-                 pRenameState->PushMemory(memoryKind, block, count);
+                 unsigned ssaNum = m_pCompiler->lvMemoryPerSsaData.AllocSsaNum(m_allocator);
+                 pRenameState->PushMemory(memoryKind, block, ssaNum);
  
 -                DBG_SSA_JITDUMP("Ssa # for %s phi on entry to BB%02u is %d.\n", memoryKindNames[memoryKind],
 +                DBG_SSA_JITDUMP("Ssa # for %s phi on entry to " FMT_BB " is %d.\n", memoryKindNames[memoryKind],
-                                 block->bbNum, count);
+                                 block->bbNum, ssaNum);
              }
          }
  
@@@ -1655,12 -1618,9 +1622,9 @@@ void SsaBuilder::RenameVariables(BlkToB
          {
              // Done, pop all the stack count, if there is one for this block.
              BlockPopStacks(block, pRenameState);
 -            DBG_SSA_JITDUMP("[SsaBuilder::RenameVariables] done with BB%02u\n", block->bbNum);
 +            DBG_SSA_JITDUMP("[SsaBuilder::RenameVariables] done with " FMT_BB "\n", block->bbNum);
          }
      }
- 
-     // Remember the number of memory SSA names.
-     m_pCompiler->lvMemoryNumSsaNames = pRenameState->MemoryCount();
  }
  
  #ifdef DEBUG

diff --cc src/jit/ssarenamestate.cpp
Simple merge

diff --cc src/jit/valuenum.cpp
Simple merge