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

tshortli · web-flow · commit 8fb90aff82ed · 2025-03-26T15:02:27.000-07:00
Fix error in ScalarEvolution.h when building the Swift compiler
diff --git a/llvm/include/llvm/Analysis/ScalarEvolution.h b/llvm/include/llvm/Analysis/ScalarEvolution.h
@@ -2492,10 +2492,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
`@@ -2492,10 +2492,12 @@ template <> struct DenseMapInfo<ScalarEvolution::FoldID> {`
`2492`	`2492`	`return Val.computeHash();`
`2493`	`2493`	`}`
`2494`	`2494`
	`2495`	`+#ifndef __swift__`
`2495`	`2496`	`static bool isEqual(const ScalarEvolution::FoldID &LHS,`
`2496`	`2497`	`const ScalarEvolution::FoldID &RHS) {`
`2497`	`2498`	`return LHS == RHS;`
`2498`	`2499`	`}`
	`2500`	`+#endif`
`2499`	`2501`	`};`
`2500`	`2502`
`2501`	`2503`	`} // end namespace llvm`