From bf115413decd211fa8f3c7683831505de52bc362 Mon Sep 17 00:00:00 2001
From: William Moses <gh@wsmoses.com>
Date: Sat, 18 Jan 2025 23:02:01 -0600
Subject: [PATCH] Adapt to upstream (#2228)

---
 .../BuiltinAutoDiffTypeInterfaceImpl.cpp         | 16 ++++++++--------
 enzyme/Enzyme/MustExitScalarEvolution.cpp        |  9 +++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/enzyme/Enzyme/MLIR/Implementations/BuiltinAutoDiffTypeInterfaceImpl.cpp b/enzyme/Enzyme/MLIR/Implementations/BuiltinAutoDiffTypeInterfaceImpl.cpp
index c38b990ceb6..bde01cb1325 100644
--- a/enzyme/Enzyme/MLIR/Implementations/BuiltinAutoDiffTypeInterfaceImpl.cpp
+++ b/enzyme/Enzyme/MLIR/Implementations/BuiltinAutoDiffTypeInterfaceImpl.cpp
@@ -41,12 +41,12 @@ static mlir::Type batchType(mlir::Type type, int64_t width) {
   return RankedTensorType::get({width}, type);
 }
 
-class FloatTypeInterface
-    : public AutoDiffTypeInterface::ExternalModel<FloatTypeInterface,
-                                                  FloatType> {
+template <typename ConcreteType>
+class FloatTypeInterface : public AutoDiffTypeInterface::ExternalModel<
+                               FloatTypeInterface<ConcreteType>, ConcreteType> {
 public:
   Value createNullValue(Type self, OpBuilder &builder, Location loc) const {
-    auto fltType = self.cast<FloatType>();
+    auto fltType = self.cast<ConcreteType>();
     return builder.create<arith::ConstantFloatOp>(
         loc, APFloat(fltType.getFloatSemantics(), 0), fltType);
   }
@@ -200,10 +200,10 @@ class ComplexTypeInterface
 void mlir::enzyme::registerBuiltinDialectAutoDiffInterface(
     DialectRegistry &registry) {
   registry.addExtension(+[](MLIRContext *context, BuiltinDialect *) {
-    BFloat16Type::attachInterface<FloatTypeInterface>(*context);
-    Float16Type::attachInterface<FloatTypeInterface>(*context);
-    Float32Type::attachInterface<FloatTypeInterface>(*context);
-    Float64Type::attachInterface<FloatTypeInterface>(*context);
+    BFloat16Type::attachInterface<FloatTypeInterface<BFloat16Type>>(*context);
+    Float16Type::attachInterface<FloatTypeInterface<Float16Type>>(*context);
+    Float32Type::attachInterface<FloatTypeInterface<Float32Type>>(*context);
+    Float64Type::attachInterface<FloatTypeInterface<Float64Type>>(*context);
     IntegerType::attachInterface<IntegerTypeInterface<IntegerType>>(*context);
     IndexType::attachInterface<IntegerTypeInterface<IndexType>>(*context);
     UnrankedTensorType::attachInterface<TensorTypeInterface>(*context);
diff --git a/enzyme/Enzyme/MustExitScalarEvolution.cpp b/enzyme/Enzyme/MustExitScalarEvolution.cpp
index dff36303f9c..dcd16068edd 100644
--- a/enzyme/Enzyme/MustExitScalarEvolution.cpp
+++ b/enzyme/Enzyme/MustExitScalarEvolution.cpp
@@ -340,12 +340,9 @@ ScalarEvolution::ExitLimit MustExitScalarEvolution::computeExitLimitFromICmp(
     const Loop *L, ICmpInst *ExitCond, bool ExitIfTrue, bool ControlsExit,
     bool AllowPredicates) {
   // If the condition was exit on true, convert the condition to exit on false
-  ICmpInst::Predicate Pred;
-  if (!ExitIfTrue)
-    Pred = ExitCond->getPredicate();
-  else
-    Pred = ExitCond->getInversePredicate();
-  const ICmpInst::Predicate OriginalPred = Pred;
+  auto Pred = (!ExitIfTrue) ? ExitCond->getPredicate()
+                            : ExitCond->getInversePredicate();
+  const auto OriginalPred = Pred;
 
 #if LLVM_VERSION_MAJOR < 14
   // Handle common loops like: for (X = "string"; *X; ++X)