Merge commit '6b446310bef9' from llvm.org/main into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit 4bbe156e8eba · 2021-04-16T13:22:28.000-07:00
diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.h b/llvm/utils/TableGen/CodeGenDAGPatterns.h
@@ -1078,7 +1078,8 @@ class Predicate {
   }
 
   bool operator==(const Predicate &P) const {
-    return IfCond == P.IfCond && IsHwMode == P.IsHwMode && Def == P.Def;
+    return IfCond == P.IfCond && IsHwMode == P.IsHwMode && Def == P.Def &&
+           Features == P.Features;
   }
   bool operator<(const Predicate &P) const {
     if (IsHwMode != P.IsHwMode)

Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,8 @@ class Predicate {`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`	`1080`	`bool operator==(const Predicate &P) const {`
`1081`		`- return IfCond == P.IfCond && IsHwMode == P.IsHwMode && Def == P.Def;`
	`1081`	`+ return IfCond == P.IfCond && IsHwMode == P.IsHwMode && Def == P.Def &&`
	`1082`	`+ Features == P.Features;`
`1082`	`1083`	`}`
`1083`	`1084`	`bool operator<(const Predicate &P) const {`
`1084`	`1085`	`if (IsHwMode != P.IsHwMode)`