Merge pull request #71032 from tshortli/work-around-cycle-detected-while-resolving-warning

tshortli · web-flow · commit ac58db8efe9b · 2024-01-22T12:13:47.000-08:00
NFC: Work around 'cycle detected while resolving' warning
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
@@ -3072,8 +3072,10 @@ class TypeAttributes {
       return *this;
     }
 
+#ifndef __swift__
     bool operator==(iterator x) const { return x.attr == attr; }
     bool operator!=(iterator x) const { return x.attr != attr; }
+#endif // __swift__
 
     CustomAttr *operator*() const { return attr; }
     CustomAttr &operator->() const { return *attr; }

Original file line number	Diff line number	Diff line change
`@@ -3072,8 +3072,10 @@ class TypeAttributes {`
`3072`	`3072`	`return *this;`
`3073`	`3073`	`}`
`3074`	`3074`
	`3075`	`+#ifndef __swift__`
`3075`	`3076`	`bool operator==(iterator x) const { return x.attr == attr; }`
`3076`	`3077`	`bool operator!=(iterator x) const { return x.attr != attr; }`
	`3078`	`+#endif // __swift__`
`3077`	`3079`
`3078`	`3080`	`CustomAttr operator() const { return attr; }`
`3079`	`3081`	`CustomAttr &operator->() const { return *attr; }`