Remove all the unnnecessary diagnostics stuff

Author: devajithvs

mlir/include/mlir/Query/Matcher/Diagnostics.h

@@ -75,20 +75,6 @@ class Diagnostics {
     std::vector<std::string> *out;
   };
 
-  // Context for constructing a matcher or parsing its argument.
-  struct Context {
-    enum ConstructMatcherEnum { ConstructMatcher };
-    Context(ConstructMatcherEnum, Diagnostics *error,
-            llvm::StringRef matcherName, SourceRange matcherRange);
-    enum MatcherArgEnum { MatcherArg };
-    Context(MatcherArgEnum, Diagnostics *error, llvm::StringRef matcherName,
-            SourceRange matcherRange, int argNumber);
-    ~Context();
-
-  private:
-    Diagnostics *const error;
-  };
-
   // Add an error message with the specified range and error type.
   // Returns an ArgStream object to allow constructing the error message using
   // the << operator.
@@ -97,30 +83,9 @@ class Diagnostics {
   // Print all error messages to the specified output stream.
   void print(llvm::raw_ostream &OS) const;
 
-  // Print the full error messages, including the context information, to the
-  // specified output stream.
-  void printFull(llvm::raw_ostream &OS) const;
-
 private:
-  // Parser context types.
-  enum class ContextType { MatcherArg, MatcherConstruct };
-
-  // Context for managing overloaded matcher construction.
-  struct OverloadContext {
-    // Construct an overload context with the given error.
-    OverloadContext(Diagnostics *error);
-    ~OverloadContext();
-    // Revert all errors that occurred within this context.
-    void revertErrors();
-
-  private:
-    Diagnostics *const error;
-    unsigned beginIndex{};
-  };
-
   // Information stored for one frame of the context.
   struct ContextFrame {
-    ContextType type;
     SourceRange range;
     std::vector<std::string> args;
   };
@@ -139,21 +104,11 @@ class Diagnostics {
   // Get an array reference to the error contents.
   llvm::ArrayRef<ErrorContent> errors() const { return errorValues; }
 
-  llvm::StringRef contextTypeToFormatString(ContextType type) const;
-
-  void printContextFrameToStream(const ContextFrame &frame,
-                                 llvm::raw_ostream &OS) const;
-
-  void printMessageToStream(const ErrorContent::Message &message,
-                            const llvm::Twine Prefix,
-                            llvm::raw_ostream &OS) const;
-
-  void printErrorContentToStream(const ErrorContent &content,
-                                 llvm::raw_ostream &OS) const;
+  void printMessage(const ErrorContent::Message &message,
+                    const llvm::Twine Prefix, llvm::raw_ostream &OS) const;
 
-  // Push a new context frame onto the context stack with the specified type and
-  // range.
-  ArgStream pushContextFrame(ContextType type, SourceRange range);
+  void printErrorContent(const ErrorContent &content,
+                         llvm::raw_ostream &OS) const;
 
   std::vector<ContextFrame> contextStack;
   std::vector<ErrorContent> errorValues;

mlir/lib/Query/Matcher/Diagnostics.cpp

@@ -10,52 +10,6 @@
 
 namespace mlir::query::matcher {
 
-Diagnostics::ArgStream Diagnostics::pushContextFrame(ContextType type,
-                                                     SourceRange range) {
-  contextStack.emplace_back();
-  ContextFrame &data = contextStack.back();
-  data.type = type;
-  data.range = range;
-  return ArgStream(&data.args);
-}
-
-Diagnostics::Context::Context(ConstructMatcherEnum, Diagnostics *error,
-                              llvm::StringRef matcherName,
-                              SourceRange matcherRange)
-    : error(error) {
-  error->pushContextFrame(ContextType::MatcherConstruct, matcherRange)
-      << matcherName;
-}
-
-Diagnostics::Context::Context(MatcherArgEnum, Diagnostics *error,
-                              llvm::StringRef matcherName,
-                              SourceRange matcherRange, int argnumber)
-    : error(error) {
-  error->pushContextFrame(ContextType::MatcherArg, matcherRange)
-      << argnumber << matcherName;
-}
-
-Diagnostics::Context::~Context() { error->contextStack.pop_back(); }
-
-Diagnostics::OverloadContext::OverloadContext(Diagnostics *error)
-    : error(error), beginIndex(error->errorValues.size()) {}
-
-Diagnostics::OverloadContext::~OverloadContext() {
-  // Merge all errors that happened while in this context.
-  if (beginIndex < error->errorValues.size()) {
-    Diagnostics::ErrorContent &dest = error->errorValues[beginIndex];
-    for (size_t i = beginIndex + 1, e = error->errorValues.size(); i < e; ++i) {
-      dest.messages.push_back(error->errorValues[i].messages[0]);
-    }
-    error->errorValues.resize(beginIndex + 1);
-  }
-}
-
-void Diagnostics::OverloadContext::revertErrors() {
-  // Revert the errors.
-  error->errorValues.resize(beginIndex);
-}
-
 Diagnostics::ArgStream &
 Diagnostics::ArgStream::operator<<(const llvm::Twine &arg) {
   out->push_back(arg.str());
@@ -73,17 +27,6 @@ Diagnostics::ArgStream Diagnostics::addError(SourceRange range,
   return ArgStream(&last.messages.back().args);
 }
 
-llvm::StringRef
-Diagnostics::contextTypeToFormatString(Diagnostics::ContextType type) const {
-  switch (type) {
-  case Diagnostics::ContextType::MatcherConstruct:
-    return "Error building matcher $0.";
-  case Diagnostics::ContextType::MatcherArg:
-    return "Error parsing argument $0 for matcher $1.";
-  }
-  llvm_unreachable("Unknown ContextType value.");
-}
-
 static llvm::StringRef errorTypeToFormatString(Diagnostics::ErrorType type) {
   switch (type) {
   case Diagnostics::ET_RegistryMatcherNotFound:
@@ -151,30 +94,24 @@ static void maybeAddLineAndColumn(SourceRange range, llvm::raw_ostream &OS) {
   }
 }
 
-void Diagnostics::printContextFrameToStream(
-    const Diagnostics::ContextFrame &frame, llvm::raw_ostream &OS) const {
-  maybeAddLineAndColumn(frame.range, OS);
-  formatErrorString(contextTypeToFormatString(frame.type), frame.args, OS);
-}
-
-void Diagnostics::printMessageToStream(
+void Diagnostics::printMessage(
     const Diagnostics::ErrorContent::Message &message, const llvm::Twine Prefix,
     llvm::raw_ostream &OS) const {
   maybeAddLineAndColumn(message.range, OS);
   OS << Prefix;
   formatErrorString(errorTypeToFormatString(message.type), message.args, OS);
 }
 
-void Diagnostics::printErrorContentToStream(
-    const Diagnostics::ErrorContent &content, llvm::raw_ostream &OS) const {
+void Diagnostics::printErrorContent(const Diagnostics::ErrorContent &content,
+                                    llvm::raw_ostream &OS) const {
   if (content.messages.size() == 1) {
-    printMessageToStream(content.messages[0], "", OS);
+    printMessage(content.messages[0], "", OS);
   } else {
     for (size_t i = 0, e = content.messages.size(); i != e; ++i) {
       if (i != 0)
         OS << "\n";
-      printMessageToStream(content.messages[i],
-                           "Candidate " + llvm::Twine(i + 1) + ": ", OS);
+      printMessage(content.messages[i],
+                   "Candidate " + llvm::Twine(i + 1) + ": ", OS);
     }
   }
 }
@@ -183,19 +120,7 @@ void Diagnostics::print(llvm::raw_ostream &OS) const {
   for (const ErrorContent &error : errorValues) {
     if (&error != &errorValues.front())
       OS << "\n";
-    printErrorContentToStream(error, OS);
-  }
-}
-
-void Diagnostics::printFull(llvm::raw_ostream &OS) const {
-  for (const ErrorContent &error : errorValues) {
-    if (&error != &errorValues.front())
-      OS << "\n";
-    for (const ContextFrame &frame : error.contextStack) {
-      printContextFrameToStream(frame, OS);
-      OS << "\n";
-    }
-    printErrorContentToStream(error, OS);
+    printErrorContent(error, OS);
   }
 }
 

mlir/lib/Query/Matcher/Parser.cpp

@@ -339,8 +339,6 @@ bool Parser::parseMatcherArgs(std::vector<ParserValue> &args, MatcherCtor ctor,
       }
     }
 
-    Diagnostics::Context ctx(Diagnostics::Context::MatcherArg, error,
-                             nameToken.text, nameToken.range, args.size() + 1);
     ParserValue argValue;
     tokenizer->skipNewlines();
 
@@ -388,8 +386,6 @@ bool Parser::parseMatcherExpressionImpl(const TokenInfo &nameToken,
   if (!ctor)
     return false;
   // Merge the start and end infos.
-  Diagnostics::Context ctx(Diagnostics::Context::ConstructMatcher, error,
-                           nameToken.text, nameToken.range);
   SourceRange matcherRange = nameToken.range;
   matcherRange.end = endToken.range.end;
   VariantMatcher result =