Minor cleanupv3

Author: devajithvs

mlir/lib/Tools/mlir-query/Marshallers.h

@@ -144,7 +144,7 @@ class VariadicMatcherCreateCallback : public MatcherCreateCallback {
 
 // Helper function to perform template argument deduction.
 template <typename MarshallerType, typename FuncType>
-auto createMarshallerCallback(MarshallerType Marshaller,
+auto *createMarshallerCallback(MarshallerType Marshaller,
                                                 FuncType Func,
                                                 StringRef MatcherName) {
   return new FixedArgCountMatcherCreateCallback<MarshallerType, FuncType>(
@@ -235,23 +235,23 @@ DynMatcher *matcherMarshall1(ReturnType (*Func)(InArgType1, InArgType2),
 
 // 0-arg overload
 template <typename T, typename ReturnType>
-auto makeMatcherAutoMarshall(ReturnType (*Func)(),
+auto *makeMatcherAutoMarshall(ReturnType (*Func)(),
                                                StringRef MatcherName) {
   return createMarshallerCallback(matcherMarshall0<T, ReturnType>, Func,
                                   MatcherName);
 }
 
 // 1-arg overload
 template <typename T, typename ReturnType, typename ArgType1>
-auto makeMatcherAutoMarshall(ReturnType (*Func)(ArgType1),
+auto *makeMatcherAutoMarshall(ReturnType (*Func)(ArgType1),
                                                StringRef MatcherName) {
   return createMarshallerCallback(matcherMarshall1<T, ReturnType, ArgType1>,
                                   Func, MatcherName);
 }
 
 // 2-arg overload
 template <typename T, typename ReturnType, typename ArgType1, typename ArgType2>
-auto makeMatcherAutoMarshall(ReturnType (*Func)(ArgType1,
+auto *makeMatcherAutoMarshall(ReturnType (*Func)(ArgType1,
                                                                   ArgType2),
                                                StringRef MatcherName) {
   return createMarshallerCallback(
@@ -260,7 +260,7 @@ auto makeMatcherAutoMarshall(ReturnType (*Func)(ArgType1,
 
 // Variadic overload.
 template <typename T, typename MatcherType>
-auto makeMatcherAutoMarshall(MatcherType Func,
+auto *makeMatcherAutoMarshall(MatcherType Func,
                                                StringRef MatcherName) {
   return new VariadicMatcherCreateCallback<T>(MatcherName);
 }

mlir/lib/Tools/mlir-query/MatchersInternal.h

@@ -51,7 +51,6 @@ class DynMatcherInterface : public llvm::RefCountedBase<DynMatcherInterface> {
 template <typename T>
 class MatcherInterface : public DynMatcherInterface {
 public:
-  // Returns true if 'Node' can be matched.
   virtual bool matches(T Node) = 0;
 
   bool dynMatches(DynTypedNode &DynNode) override {
@@ -73,14 +72,8 @@ class DynMatcher {
         RestrictKind(SupportedKind), Implementation(Implementation),
         ExtractFunction(false) {}
 
-  // Returns true if the matcher matches the given op.
   bool matches(DynTypedNode &DynNode) const {
-    if (RestrictKind.isSame(DynNode.getNodeKind()) &&
-        Implementation->dynMatches(DynNode)) {
-      return true;
-    }
-
-    return false;
+    return RestrictKind.isSame(DynNode.getNodeKind()) && Implementation->dynMatches(DynNode);
   }
 
   DynMatcher *clone() const { return new DynMatcher(*this); }
@@ -105,7 +98,7 @@ template <typename T>
 class Matcher {
 public:
   // Takes ownership of the provided implementation pointer.
-  explicit Matcher(MatcherInterface<T> *Implementation)
+  Matcher(MatcherInterface<T> *Implementation)
       : Implementation(Implementation) {}
 
   // Forwards the call to the underlying MatcherInterface<T> pointer.

mlir/lib/Tools/mlir-query/Parser.cpp

@@ -177,7 +177,7 @@ class Parser::CodeTokenizer {
       }
     }
 
-    Result->Text = Code.substr(0, Length);
+    Result->Text = Code.take_front(Length);
     Code = Code.drop_front(Length);
 
     if (isFloatingLiteral) {