Merge pull request #10358 from tshortli/suppress-cxx-interop-cycle-warning-20240723

tshortli · web-flow · commit da17cd8368b0 · 2025-03-31T11:30:45.000-07:00
Suppress CXX interop cycle warning for the Swift compiler
diff --git a/llvm/include/llvm/Analysis/ScalarEvolution.h b/llvm/include/llvm/Analysis/ScalarEvolution.h
@@ -1383,9 +1383,11 @@ class ScalarEvolution {
                                       reinterpret_cast<uintptr_t>(Ty)));
     }
 
+#ifndef __swift__
     bool operator==(const FoldID &RHS) const {
       return std::tie(Op, Ty, C) == std::tie(RHS.Op, RHS.Ty, RHS.C);
     }
+#endif
   };
 
 private:
@@ -2446,10 +2448,12 @@ template <> struct DenseMapInfo<ScalarEvolution::FoldID> {
     return Val.computeHash();
   }
 
+#ifndef __swift__
   static bool isEqual(const ScalarEvolution::FoldID &LHS,
                       const ScalarEvolution::FoldID &RHS) {
     return LHS == RHS;
   }
+#endif
 };
 
 } // end namespace llvm

Original file line number	Diff line number	Diff line change
`@@ -1383,9 +1383,11 @@ class ScalarEvolution {`
`1383`	`1383`	`reinterpret_cast<uintptr_t>(Ty)));`
`1384`	`1384`	`}`
`1385`	`1385`
	`1386`	`+#ifndef __swift__`
`1386`	`1387`	`bool operator==(const FoldID &RHS) const {`
`1387`	`1388`	`return std::tie(Op, Ty, C) == std::tie(RHS.Op, RHS.Ty, RHS.C);`
`1388`	`1389`	`}`
	`1390`	`+#endif`
`1389`	`1391`	`};`
`1390`	`1392`
`1391`	`1393`	`private:`
`@@ -2446,10 +2448,12 @@ template <> struct DenseMapInfo<ScalarEvolution::FoldID> {`
`2446`	`2448`	`return Val.computeHash();`
`2447`	`2449`	`}`
`2448`	`2450`
	`2451`	`+#ifndef __swift__`
`2449`	`2452`	`static bool isEqual(const ScalarEvolution::FoldID &LHS,`
`2450`	`2453`	`const ScalarEvolution::FoldID &RHS) {`
`2451`	`2454`	`return LHS == RHS;`
`2452`	`2455`	`}`
	`2456`	`+#endif`
`2453`	`2457`	`};`
`2454`	`2458`
`2455`	`2459`	`} // end namespace llvm`