Fix sanitizer issue

Author: sopyb

clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp

@@ -60,16 +60,12 @@ static FindArgsResult findArgs(const CallExpr *Call) {
 
       return Result;
     }
+    Result.Args = SmallVector<const Expr *>(Call->arguments());
   } else {
     // if it has 3 arguments then the last will be the comparison
     Result.Compare = *(std::next(Call->arguments().begin(), 2));
-  }
-
-  if (Result.Compare)
     Result.Args = SmallVector<const Expr *>(llvm::drop_end(Call->arguments()));
-  else
-    Result.Args = SmallVector<const Expr *>(Call->arguments());
-
+  }
   Result.First = Result.Args.front();
   Result.Last = Result.Args.back();
 
@@ -80,7 +76,7 @@ static SmallVector<FixItHint>
 generateReplacements(const MatchFinder::MatchResult &Match,
                      const CallExpr *TopCall, const FindArgsResult &Result,
                      const bool IgnoreNonTrivialTypes,
-                     const long IgnoreTrivialTypesOfSizeAbove) {
+                     const std::uint64_t IgnoreTrivialTypesOfSizeAbove) {
   SmallVector<FixItHint> FixItHints;
   const SourceManager &SourceMngr = *Match.SourceManager;
   const LangOptions &LanguageOpts = Match.Context->getLangOpts();
@@ -98,7 +94,6 @@ generateReplacements(const MatchFinder::MatchResult &Match,
     return FixItHints;
 
   if (isResultTypeTrivial &&
-      // size in bits divided by 8 to get bytes
       Match.Context->getTypeSizeInChars(ResultType).getQuantity() >
           IgnoreTrivialTypesOfSizeAbove)
     return FixItHints;
@@ -125,11 +120,11 @@ generateReplacements(const MatchFinder::MatchResult &Match,
                                    .concat(ResultType.getAsString(LanguageOpts))
                                    .concat(">(")
                                    .concat(ArgText)
-                                   .concat(")");
-
-      FixItHints.push_back(FixItHint::CreateReplacement(Arg->getSourceRange(),
-                                                        Replacement.str()));
+                                   .concat(")")
+                                   .str();
 
+      FixItHints.push_back(
+          FixItHint::CreateReplacement(Arg->getSourceRange(), Replacement));
       continue;
     }
 

clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.h

@@ -47,7 +47,7 @@ class MinMaxUseInitializerListCheck : public ClangTidyCheck {
 
 private:
   bool IgnoreNonTrivialTypes;
-  long IgnoreTrivialTypesOfSizeAbove;
+  std::uint64_t IgnoreTrivialTypesOfSizeAbove;
   utils::IncludeInserter Inserter;
 };
 

clang-tools-extra/docs/clang-tidy/checks/modernize/min-max-use-initializer-list.rst

@@ -47,4 +47,4 @@ Options
 .. option:: IgnoreTrivialTypesOfSizeAbove
 
    An integer specifying the size (in bytes) above which trivial types are 
-ignored. Default is `32`.
+  ignored. Default is `32`.