Merge commit '09feea972d0f' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit a3326bce8a44 · 2019-10-29T09:28:47.000-04:00
diff --git a/llvm/lib/IR/Constants.cpp b/llvm/lib/IR/Constants.cpp
@@ -596,8 +596,9 @@ void Constant::removeDeadConstantUsers() const {
 }
 
 Constant *Constant::replaceUndefsWith(Constant *C, Constant *Replacement) {
+  assert(C && Replacement && "Expected non-nullptr constant arguments");
   Type *Ty = C->getType();
-  if (C && match(C, m_Undef())) {
+  if (match(C, m_Undef())) {
     assert(Ty == Replacement->getType() && "Expected matching types");
     return Replacement;
   }

Original file line number	Diff line number	Diff line change
`@@ -596,8 +596,9 @@ void Constant::removeDeadConstantUsers() const {`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`Constant Constant::replaceUndefsWith(Constant C, Constant *Replacement) {`
	`599`	`+ assert(C && Replacement && "Expected non-nullptr constant arguments");`
`599`	`600`	`Type *Ty = C->getType();`
`600`		`- if (C && match(C, m_Undef())) {`
	`601`	`+ if (match(C, m_Undef())) {`
`601`	`602`	`assert(Ty == Replacement->getType() && "Expected matching types");`
`602`	`603`	`return Replacement;`
`603`	`604`	`}`