1 files changed, 14 insertions, 6 deletions
diff --git a/llvm/tools/sanstats/sanstats.cpp b/llvm/tools/sanstats/sanstats.cpp
index 3a8cc9aea8c..95f5424ba66 100644
--- a/llvm/tools/sanstats/sanstats.cpp
+++ b/llvm/tools/sanstats/sanstats.cpp
@@ -12,20 +12,26 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/Symbolize/Symbolize.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Transforms/Utils/SanitizerStats.h"
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
+#include <memory>
+#include <string>
 
 using namespace llvm;
 
-static cl::opt<std::string> ClInputFile(cl::Positional, cl::Required,
-                                        cl::desc("<filename>"));
+namespace {
 
-static cl::opt<bool> ClDemangle("demangle", cl::init(false),
-                                cl::desc("Print demangled function name."));
+cl::opt<std::string> ClInputFile(cl::Positional, cl::Required,
+                                 cl::desc("<filename>"));
+
+cl::opt<bool> ClDemangle("demangle", cl::init(false),
+                         cl::desc("Print demangled function name."));
 
 inline uint64_t KindFromData(uint64_t Data, char SizeofPtr) {
   return Data >> (SizeofPtr * 8 - kSanitizerStatKindBits);
@@ -63,7 +69,7 @@ const char *ReadModule(char SizeofPtr, const char *Begin, const char *End) {
   SymbolizerOptions.UseSymbolTable = true;
   symbolize::LLVMSymbolizer Symbolizer(SymbolizerOptions);
 
-  while (1) {
+  while (true) {
     uint64_t Addr = ReadLE(SizeofPtr, Begin, End);
     Begin += SizeofPtr;
     uint64_t Data = ReadLE(SizeofPtr, Begin, End);
@@ -109,6 +115,8 @@ const char *ReadModule(char SizeofPtr, const char *Begin, const char *End) {
   }
 }
 
+} // end anonymous namespace
+
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv,
                               "Sanitizer Statistics Processing Tool");