Merge branch '19h1-fixes' into 19h1-fixes-on-master

lib/HLSL/HLMatrixLowerPass.cpp

@@ -665,7 +665,7 @@ void HLMatrixLowerPass::lowerInstruction(Instruction* Inst) {
 void HLMatrixLowerPass::lowerReturn(ReturnInst* Return) {
   Value *RetVal = Return->getReturnValue();
   Type *RetTy = RetVal->getType();
-  DXASSERT(!RetTy->isPointerTy(), "Unexpected matrix returned by pointer.");
+  DXASSERT_LOCALVAR(RetTy, !RetTy->isPointerTy(), "Unexpected matrix returned by pointer.");
 
   IRBuilder<> Builder(Return);
   Value *LoweredRetVal = getLoweredByValOperand(RetVal, Builder, /* DiscardStub */ true);

lib/Transforms/Scalar/DxilLoopUnroll.cpp

@@ -956,7 +956,7 @@ bool DxilLoopUnroll::runOnLoop(Loop *L, LPPassManager &LPM) {
     // they're in entry block so deleting loop blocks don't 
     // kill them too.
     for (AllocaInst *AI : ProblemAllocas)
-      DXASSERT(AI->getParent() == &F->getEntryBlock(), "Alloca is not in entry block.");
+      DXASSERT_LOCALVAR(AI, AI->getParent() == &F->getEntryBlock(), "Alloca is not in entry block.");
 
     LoopIteration &FirstIteration = *Iterations.front().get();
     // Make the predecessor branch to the first new header.