fix build with llvm-16 (#5)

Author: stepasite

enzyme/Enzyme/AdjointGenerator.h

@@ -9823,9 +9823,15 @@ class AdjointGenerator
     CallInst *augmentcall = nullptr;
     Value *cachereplace = nullptr;
 
+#if LLVM_VERSION_MAJOR >= 16
+    std::optional<int> tapeIdx;
+    std::optional<int> returnIdx;
+    std::optional<int> differetIdx;
+#else
     Optional<int> tapeIdx;
     Optional<int> returnIdx;
     Optional<int> differetIdx;
+#endif
 
     if (modifyPrimal) {
       Value *newcalled = nullptr;
@@ -9942,12 +9948,21 @@ class AdjointGenerator
         if (!augmentcall->getType()->isVoidTy())
           augmentcall->setName(call.getName() + "_augmented");
 
+#if LLVM_VERSION_MAJOR >= 16
+        if (tapeIdx.has_value()) {
+          tape = (tapeIdx.value() == -1)
+                     ? augmentcall
+                     : BuilderZ.CreateExtractValue(
+                           augmentcall, {(unsigned)tapeIdx.value()},
+                           "subcache");
+#else
         if (tapeIdx.hasValue()) {
           tape = (tapeIdx.getValue() == -1)
                      ? augmentcall
                      : BuilderZ.CreateExtractValue(
                            augmentcall, {(unsigned)tapeIdx.getValue()},
                            "subcache");
+#endif
           if (tape->getType()->isEmptyTy()) {
             auto tt = tape->getType();
             gutils->erase(cast<Instruction>(tape));
@@ -9963,10 +9978,17 @@ class AdjointGenerator
           Value *dcall = nullptr;
           assert(returnIdx);
           assert(augmentcall);
+#if LLVM_VERSION_MAJOR >= 16
+          dcall = (returnIdx.value() < 0)
+                      ? augmentcall
+                      : BuilderZ.CreateExtractValue(
+                            augmentcall, {(unsigned)returnIdx.value()});
+#else
           dcall = (returnIdx.getValue() < 0)
                       ? augmentcall
                       : BuilderZ.CreateExtractValue(
                             augmentcall, {(unsigned)returnIdx.getValue()});
+#endif
           gutils->originalToNewFn[&call] = dcall;
           gutils->newToOriginalFn.erase(newCall);
           gutils->newToOriginalFn[dcall] = &call;
@@ -10029,12 +10051,21 @@ class AdjointGenerator
                            subdata->returns.end()) {
         } else {
           if (!tape) {
+#if LLVM_VERSION_MAJOR >= 16
+            assert(tapeIdx.has_value());
+            tape = BuilderZ.CreatePHI(
+                (tapeIdx == -1) ? FT->getReturnType()
+                                : cast<StructType>(FT->getReturnType())
+                                      ->getElementType(tapeIdx.value()),
+                1, "tapeArg");
+#else
             assert(tapeIdx.hasValue());
             tape = BuilderZ.CreatePHI(
                 (tapeIdx == -1) ? FT->getReturnType()
                                 : cast<StructType>(FT->getReturnType())
                                       ->getElementType(tapeIdx.getValue()),
                 1, "tapeArg");
+#endif
           }
           tape = gutils->cacheForReverse(BuilderZ, tape,
                                          getIndex(&call, CacheType::Tape));
@@ -10081,11 +10112,19 @@ class AdjointGenerator
           Value *newip = nullptr;
           if (Mode == DerivativeMode::ReverseModeCombined ||
               Mode == DerivativeMode::ReverseModePrimal) {
+#if LLVM_VERSION_MAJOR >= 16
+            newip = (differetIdx.value() < 0)
+                        ? augmentcall
+                        : BuilderZ.CreateExtractValue(
+                              augmentcall, {(unsigned)differetIdx.value()},
+                              call.getName() + "'ac");
+#else
             newip = (differetIdx.getValue() < 0)
                         ? augmentcall
                         : BuilderZ.CreateExtractValue(
                               augmentcall, {(unsigned)differetIdx.getValue()},
                               call.getName() + "'ac");
+#endif
             assert(newip->getType() == call.getType());
             placeholder->replaceAllUsesWith(newip);
             if (placeholder == &*BuilderZ.GetInsertPoint()) {

enzyme/Enzyme/Enzyme.cpp

@@ -1701,9 +1701,15 @@ class EnzymeBase {
 #endif
     }
 
+#if LLVM_VERSION_MAJOR >= 16
+    return HandleAutoDiff(CI, CI->getCallingConv(), ret, retElemType, args,
+                          byVal, constants, fn, mode, options.value(),
+                          sizeOnly);
+#else
     return HandleAutoDiff(CI, CI->getCallingConv(), ret, retElemType, args,
                           byVal, constants, fn, mode, options.getValue(),
                           sizeOnly);
+#endif
   }
 
   bool HandleProbProg(CallInst *CI, ProbProgMode mode) {
@@ -1725,8 +1731,13 @@ class EnzymeBase {
 
     SmallVector<Value *, 6> dargs = SmallVector(args);
 
+#if LLVM_VERSION_MAJOR >= 16
+    if (!opt.has_value())
+      return false;
+#else
     if (!opt.hasValue())
       return false;
+#endif
 
     auto dynamic_interface = opt->dynamic_interface;
     auto trace = opt->trace.first;
@@ -1817,9 +1828,14 @@ class EnzymeBase {
 #endif
     }
 
+#if LLVM_VERSION_MAJOR >= 16
     bool status = HandleAutoDiff(
+        CI, CI->getCallingConv(), ret, retElemType, dargs, byVal, constants,
+        newFunc, DerivativeMode::ReverseModeCombined, opt.value(), false);
+#else
         CI, CI->getCallingConv(), ret, retElemType, dargs, byVal, constants,
         newFunc, DerivativeMode::ReverseModeCombined, opt.getValue(), false);
+#endif
 
     delete interface;