Fixes warnings and adds missing header guards

enzyme/Enzyme/ActivityAnalysisPrinter.h

@@ -22,6 +22,10 @@
 // results of a given function.
 //
 //===----------------------------------------------------------------------===//
+
+#ifndef ENZYME_ACTIVITY_ANALYSIS_PRINTER_H
+#define ENZYME_ACTIVITY_ANALYSIS_PRINTER_H
+
 #include <llvm/Config/llvm-config.h>
 
 #include "llvm/IR/PassManager.h"
@@ -46,3 +50,5 @@ class ActivityAnalysisPrinterNewPM final
 
   static bool isRequired() { return true; }
 };
+
+#endif // ENZYME_ACTIVITY_ANALYSIS_PRINTER_H

enzyme/Enzyme/AdjointGenerator.h

@@ -23,6 +23,10 @@
 // LLVM instructions.
 //
 //===----------------------------------------------------------------------===//
+
+#ifndef ENZYME_ADJOINT_GENERATOR_H
+#define ENZYME_ADJOINT_GENERATOR_H
+
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
@@ -6414,3 +6418,5 @@ class AdjointGenerator : public llvm::InstVisitor<AdjointGenerator> {
                                         subretused);
   }
 };
+
+#endif // ENZYME_ADJOINT_GENERATOR_H

enzyme/Enzyme/Enzyme.cpp

@@ -3333,8 +3333,7 @@ extern cl::opt<unsigned> SetLicmMssaOptCap;
 
 void augmentPassBuilder(llvm::PassBuilder &PB) {
 
-  auto PB0 = new llvm::PassBuilder(PB);
-  auto prePass = [PB0](ModulePassManager &MPM, OptimizationLevel Level) {
+  auto prePass = [](ModulePassManager &MPM, OptimizationLevel Level) {
     FunctionPassManager OptimizePM;
     OptimizePM.addPass(Float2IntPass());
     OptimizePM.addPass(LowerConstantIntrinsicsPass());

enzyme/Enzyme/Enzyme.h

@@ -24,8 +24,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef ENZYME_H
+#define ENZYME_H
+
 #include "llvm/Pass.h"
 #include "llvm/Passes/PassBuilder.h"
 
 llvm::ModulePass *createEnzymePass(bool PostOpt = false);
 void augmentPassBuilder(llvm::PassBuilder &PB);
+
+#endif // ENZYME_H

enzyme/Enzyme/EnzymeLogic.cpp

@@ -1352,21 +1352,6 @@ bool shouldAugmentCall(CallInst *op, const GradientUtils *gutils) {
   return modifyPrimal;
 }
 
-static inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
-                                            ModRefInfo mri) {
-  if (mri == ModRefInfo::NoModRef)
-    return os << "nomodref";
-  else if (mri == ModRefInfo::ModRef)
-    return os << "modref";
-  else if (mri == ModRefInfo::Mod)
-    return os << "mod";
-  else if (mri == ModRefInfo::Ref)
-    return os << "ref";
-  else
-    llvm_unreachable("unknown modref");
-  return os;
-}
-
 bool legalCombinedForwardReverse(
     CallInst *origop,
     const std::map<ReturnInst *, StoreInst *> &replacedReturns,

enzyme/Enzyme/JLInstSimplify.h

@@ -17,6 +17,10 @@
 // }
 //
 //===----------------------------------------------------------------------===//
+
+#ifndef ENZYME_JL_INST_SIMPLIFY_H
+#define ENZYME_JL_INST_SIMPLIFY_H
+
 #include <llvm/Config/llvm-config.h>
 
 #include "llvm/IR/PassManager.h"
@@ -41,3 +45,5 @@ class JLInstSimplifyNewPM final
 
   static bool isRequired() { return true; }
 };
+
+#endif // ENZYME_JL_INST_SIMPLIFY_H

enzyme/Enzyme/MLIR/Interfaces/GradientUtilsReverse.h

@@ -7,6 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef ENZYME_MLIR_INTERFACES_GRADIENT_UTILS_REVERSE_H
+#define ENZYME_MLIR_INTERFACES_GRADIENT_UTILS_REVERSE_H
+
 #include "mlir/IR/IRMapping.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
 
@@ -71,3 +74,5 @@ class MGradientUtilsReverse : public MDiffeGradientUtils {
 
 } // namespace enzyme
 } // namespace mlir
+
+#endif // ENZYME_MLIR_INTERFACES_GRADIENT_UTILS_REVERSE_H

enzyme/Enzyme/PreserveNVVM.h

@@ -24,6 +24,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef ENZYME_PRESERVE_NVVM_H
+#define ENZYME_PRESERVE_NVVM_H
+
 #include "llvm/IR/PassManager.h"
 #include "llvm/Passes/PassPlugin.h"
 
@@ -50,3 +53,5 @@ class PreserveNVVMNewPM final
 
   static bool isRequired() { return true; }
 };
+
+#endif // ENZYME_PRESERVE_NVVM_H

enzyme/Enzyme/TypeAnalysis/TypeAnalysisPrinter.h

@@ -23,6 +23,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef ENZYME_TYPE_ANALYSIS_TYPE_ANALYSIS_PRINTER_H
+#define ENZYME_TYPE_ANALYSIS_TYPE_ANALYSIS_PRINTER_H
+
 #include "llvm/IR/PassManager.h"
 #include "llvm/Passes/PassPlugin.h"
 
@@ -45,3 +48,5 @@ class TypeAnalysisPrinterNewPM final
 
   static bool isRequired() { return true; }
 };
+
+#endif // ENZYME_TYPE_ANALYSIS_TYPE_ANALYSIS_PRINTER_H