This reverts r313381

llvm-svn: 313387

Author: vivekvpandya

llvm/include/llvm/Analysis/OptimizationDiagnosticInfo.h

@@ -78,9 +78,10 @@ class OptimizationRemarkEmitter {
   /// use the extra analysis (1) to filter trivial false positives or (2) to
   /// provide more context so that non-trivial false positives can be quickly
   /// detected by the user.
-  bool allowExtraAnalysis(StringRef PassName) const {
-    return (F->getContext().getDiagnosticsOutputFile() ||
-            F->getContext().getDiagHandlerPtr()->isAnyRemarkEnabled(PassName));
+  bool allowExtraAnalysis() const {
+    // For now, only allow this with -fsave-optimization-record since the -Rpass
+    // options are handled in the front-end.
+    return F->getContext().getDiagnosticsOutputFile();
   }
 
 private:

llvm/include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h

@@ -73,9 +73,7 @@ class MachineOptimizationRemark : public DiagnosticInfoMIROptimization {
 
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
   bool isEnabled() const override {
-    const Function &Fn = getFunction();
-    LLVMContext &Ctx = Fn.getContext();
-    return Ctx.getDiagHandlerPtr()->isPassedOptRemarkEnabled(getPassName());
+    return OptimizationRemark::isEnabled(getPassName());
   }
 };
 
@@ -99,9 +97,7 @@ class MachineOptimizationRemarkMissed : public DiagnosticInfoMIROptimization {
 
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
   bool isEnabled() const override {
-    const Function &Fn = getFunction();
-    LLVMContext &Ctx = Fn.getContext();
-    return Ctx.getDiagHandlerPtr()->isMissedOptRemarkEnabled(getPassName());
+    return OptimizationRemarkMissed::isEnabled(getPassName());
   }
 };
 
@@ -125,9 +121,7 @@ class MachineOptimizationRemarkAnalysis : public DiagnosticInfoMIROptimization {
 
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
   bool isEnabled() const override {
-    const Function &Fn = getFunction();
-    LLVMContext &Ctx = Fn.getContext();
-    return Ctx.getDiagHandlerPtr()->isAnalysisRemarkEnabled(getPassName());
+    return OptimizationRemarkAnalysis::isEnabled(getPassName());
   }
 };
 
@@ -158,10 +152,10 @@ class MachineOptimizationRemarkEmitter {
   /// that are normally too noisy.  In this mode, we can use the extra analysis
   /// (1) to filter trivial false positives or (2) to provide more context so
   /// that non-trivial false positives can be quickly detected by the user.
-  bool allowExtraAnalysis(StringRef PassName) const {
-    return (MF.getFunction()->getContext().getDiagnosticsOutputFile() ||
-            MF.getFunction()->getContext()
-            .getDiagHandlerPtr()->isAnyRemarkEnabled(PassName));
+  bool allowExtraAnalysis() const {
+    // For now, only allow this with -fsave-optimization-record since the -Rpass
+    // options are handled in the front-end.
+    return MF.getFunction()->getContext().getDiagnosticsOutputFile();
   }
 
 private:

llvm/include/llvm/IR/DiagnosticHandler.h

@@ -604,8 +604,10 @@ class OptimizationRemark : public DiagnosticInfoIROptimization {
     return DI->getKind() == DK_OptimizationRemark;
   }
 
+  static bool isEnabled(StringRef PassName);
+
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
-  bool isEnabled() const override;
+  bool isEnabled() const override { return isEnabled(getPassName()); }
 
 private:
   /// This is deprecated now and only used by the function API below.
@@ -645,8 +647,10 @@ class OptimizationRemarkMissed : public DiagnosticInfoIROptimization {
     return DI->getKind() == DK_OptimizationRemarkMissed;
   }
 
+  static bool isEnabled(StringRef PassName);
+
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
-  bool isEnabled() const override;
+  bool isEnabled() const override { return isEnabled(getPassName()); }
 
 private:
   /// This is deprecated now and only used by the function API below.
@@ -697,8 +701,12 @@ class OptimizationRemarkAnalysis : public DiagnosticInfoIROptimization {
     return DI->getKind() == DK_OptimizationRemarkAnalysis;
   }
 
+  static bool isEnabled(StringRef PassName);
+
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
-  bool isEnabled() const override;
+  bool isEnabled() const override {
+    return shouldAlwaysPrint() || isEnabled(getPassName());
+  }
 
   static const char *AlwaysPrint;
 

llvm/include/llvm/IR/DiagnosticInfo.h

@@ -16,7 +16,6 @@
 #define LLVM_IR_LLVMCONTEXT_H
 
 #include "llvm-c/Types.h"
-#include "llvm/IR/DiagnosticHandler.h"
 #include "llvm/Support/CBindingWrapping.h"
 #include "llvm/Support/Options.h"
 #include <cstdint>
@@ -168,6 +167,11 @@ class LLVMContext {
   using InlineAsmDiagHandlerTy = void (*)(const SMDiagnostic&, void *Context,
                                           unsigned LocCookie);
 
+  /// Defines the type of a diagnostic handler.
+  /// \see LLVMContext::setDiagnosticHandler.
+  /// \see LLVMContext::diagnose.
+  using DiagnosticHandlerTy = void (*)(const DiagnosticInfo &DI, void *Context);
+
   /// Defines the type of a yield callback.
   /// \see LLVMContext::setYieldCallback.
   using YieldCallbackTy = void (*)(LLVMContext *Context, void *OpaqueHandle);
@@ -190,43 +194,26 @@ class LLVMContext {
   /// setInlineAsmDiagnosticHandler.
   void *getInlineAsmDiagnosticContext() const;
 
-  /// setDiagnosticHandlerCallBack - This method sets a handler call back
-  /// that is invoked when the backend needs to report anything to the user.
-  /// The first argument is a function pointer and the second is a context pointer
-  /// that gets passed into the DiagHandler.  The third argument should be set to
+  /// setDiagnosticHandler - This method sets a handler that is invoked
+  /// when the backend needs to report anything to the user.  The first
+  /// argument is a function pointer and the second is a context pointer that
+  /// gets passed into the DiagHandler.  The third argument should be set to
   /// true if the handler only expects enabled diagnostics.
   ///
   /// LLVMContext doesn't take ownership or interpret either of these
   /// pointers.
-  void setDiagnosticHandlerCallBack(
-      DiagnosticHandler::DiagnosticHandlerTy DiagHandler,
-      void *DiagContext = nullptr, bool RespectFilters = false);
-
-  /// setDiagnosticHandler - This method sets unique_ptr to object of DiagnosticHandler
-  /// to provide custom diagnostic handling. The first argument is unique_ptr of object
-  /// of type DiagnosticHandler or a derived of that.   The third argument should be
-  /// set to true if the handler only expects enabled diagnostics.
-  ///
-  /// Ownership of this pointer is moved to LLVMContextImpl.
-  void setDiagnosticHandler(std::unique_ptr<DiagnosticHandler> &&DH,
+  void setDiagnosticHandler(DiagnosticHandlerTy DiagHandler,
+                            void *DiagContext = nullptr,
                             bool RespectFilters = false);
 
-  /// getDiagnosticHandlerCallBack - Return the diagnostic handler call back set by
-  /// setDiagnosticHandlerCallBack.
-  DiagnosticHandler::DiagnosticHandlerTy getDiagnosticHandlerCallBack() const;
+  /// getDiagnosticHandler - Return the diagnostic handler set by
+  /// setDiagnosticHandler.
+  DiagnosticHandlerTy getDiagnosticHandler() const;
 
   /// getDiagnosticContext - Return the diagnostic context set by
   /// setDiagnosticContext.
   void *getDiagnosticContext() const;
 
-  /// getDiagHandlerPtr - Returns const raw pointer of DiagnosticHandler set by
-  /// setDiagnosticHandler.
-  const DiagnosticHandler *getDiagHandlerPtr() const;
-
-  /// getDiagnosticHandler - transfers owenership of DiagnosticHandler unique_ptr
-  /// to caller.
-  std::unique_ptr<DiagnosticHandler> getDiagnosticHandler();
-
   /// \brief Return if a code hotness metric should be included in optimization
   /// diagnostics.
   bool getDiagnosticsHotnessRequested() const;

llvm/include/llvm/IR/LLVMContext.h

@@ -171,27 +171,20 @@ struct Config {
                      bool UseInputModulePath = false);
 };
 
-struct LTOLLVMDiagnosticHandler : public DiagnosticHandler {
-  DiagnosticHandlerFunction *Fn;
-  LTOLLVMDiagnosticHandler(DiagnosticHandlerFunction *DiagHandlerFn)
-      : Fn(DiagHandlerFn) {}
-  bool handleDiagnostics(const DiagnosticInfo &DI) override {
-    (*Fn)(DI);
-    return true;
-  }
-};
 /// A derived class of LLVMContext that initializes itself according to a given
 /// Config object. The purpose of this class is to tie ownership of the
 /// diagnostic handler to the context, as opposed to the Config object (which
 /// may be ephemeral).
-// FIXME: This should not be required as diagnostic handler is not callback.
 struct LTOLLVMContext : LLVMContext {
+  static void funcDiagHandler(const DiagnosticInfo &DI, void *Context) {
+    auto *Fn = static_cast<DiagnosticHandlerFunction *>(Context);
+    (*Fn)(DI);
+  }
 
   LTOLLVMContext(const Config &C) : DiagHandler(C.DiagHandler) {
     setDiscardValueNames(C.ShouldDiscardValueNames);
     enableDebugTypeODRUniquing();
-    setDiagnosticHandler(
-        llvm::make_unique<LTOLLVMDiagnosticHandler>(&DiagHandler), true);
+    setDiagnosticHandler(funcDiagHandler, &DiagHandler, true);
   }
   DiagnosticHandlerFunction DiagHandler;
 };

llvm/include/llvm/LTO/Config.h

@@ -184,7 +184,6 @@ struct LTOCodeGenerator {
   LLVMContext &getContext() { return Context; }
 
   void resetMergedModule() { MergedModule.reset(); }
-  void DiagnosticHandler(const DiagnosticInfo &DI);
 
 private:
   void initializeLTOPasses();
@@ -205,6 +204,10 @@ struct LTOCodeGenerator {
   bool determineTarget();
   std::unique_ptr<TargetMachine> createTargetMachine();
 
+  static void DiagnosticHandler(const DiagnosticInfo &DI, void *Context);
+
+  void DiagnosticHandler2(const DiagnosticInfo &DI);
+
   void emitError(const std::string &ErrMsg);
   void emitWarning(const std::string &ErrMsg);
 

llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h

@@ -17,7 +17,6 @@ add_llvm_library(LLVMCore
   DebugInfo.cpp
   DebugInfoMetadata.cpp
   DebugLoc.cpp
-  DiagnosticHandler.cpp
   DiagnosticInfo.cpp
   DiagnosticPrinter.cpp
   Dominators.cpp

llvm/lib/IR/CMakeLists.txt

@@ -85,15 +85,15 @@ LLVMContextRef LLVMGetGlobalContext() { return wrap(&*GlobalContext); }
 void LLVMContextSetDiagnosticHandler(LLVMContextRef C,
                                      LLVMDiagnosticHandler Handler,
                                      void *DiagnosticContext) {
-  unwrap(C)->setDiagnosticHandlerCallBack(
-      LLVM_EXTENSION reinterpret_cast<DiagnosticHandler::DiagnosticHandlerTy>(
+  unwrap(C)->setDiagnosticHandler(
+      LLVM_EXTENSION reinterpret_cast<LLVMContext::DiagnosticHandlerTy>(
           Handler),
       DiagnosticContext);
 }
 
 LLVMDiagnosticHandler LLVMContextGetDiagnosticHandler(LLVMContextRef C) {
   return LLVM_EXTENSION reinterpret_cast<LLVMDiagnosticHandler>(
-      unwrap(C)->getDiagnosticHandlerCallBack());
+      unwrap(C)->getDiagnosticHandler());
 }
 
 void *LLVMContextGetDiagnosticContext(LLVMContextRef C) {