Merge in 'release/5.0' changes

dotnet-bot · dotnet-bot · commit 2d2f6186d99d · 2020-12-11T21:56:07.000Z
diff --git a/src/coreclr/src/jit/emitxarch.cpp b/src/coreclr/src/jit/emitxarch.cpp
@@ -3113,7 +3113,7 @@ void emitter::emitInsStoreInd(instruction ins, emitAttr attr, GenTreeStoreInd* m
         }
 
         // Updating variable liveness after instruction was emitted
-        codeGen->genUpdateLife(varNode);
+        codeGen->genUpdateLife(mem);
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3113,7 +3113,7 @@ void emitter::emitInsStoreInd(instruction ins, emitAttr attr, GenTreeStoreInd* m`
`3113`	`3113`	`}`
`3114`	`3114`
`3115`	`3115`	`// Updating variable liveness after instruction was emitted`
`3116`		`- codeGen->genUpdateLife(varNode);`
	`3116`	`+ codeGen->genUpdateLife(mem);`
`3117`	`3117`	`return;`
`3118`	`3118`	`}`
`3119`	`3119`