Command line options clean up (#692)

We previously used the _3COptions structure to store command line options
immediately after they were parsed, but later copied the option values out of
this structure and into global variables for use in the rest of the program.
This change deletes the global variables and replaces them with a single
global instance of the _3COptions structure.

Author: john-h-kastner

clang/include/clang/3C/3C.h

@@ -22,60 +22,6 @@
 #include "clang/Tooling/CommonOptionsParser.h"
 #include <mutex>
 
-// Options used to initialize 3C tool.
-//
-// See clang/docs/checkedc/3C/clang-tidy.md#_3c-name-prefix
-// NOLINTNEXTLINE(readability-identifier-naming)
-struct _3COptions {
-  bool DumpIntermediate;
-
-  bool Verbose;
-
-  std::string OutputPostfix;
-  std::string OutputDir;
-
-  std::string ConstraintOutputJson;
-
-  bool DumpStats;
-
-  std::string StatsOutputJson;
-
-  std::string WildPtrInfoJson;
-
-  std::string PerPtrInfoJson;
-
-  std::vector<std::string> AllocatorFunctions;
-
-  bool HandleVARARGS;
-
-  bool EnablePropThruIType;
-
-  std::string BaseDir;
-  bool AllowSourcesOutsideBaseDir;
-
-  bool EnableAllTypes;
-
-  bool AddCheckedRegions;
-
-  bool EnableCCTypeChecker;
-
-  bool WarnRootCause;
-
-  bool WarnAllRootCause;
-
-#ifdef FIVE_C
-  bool RemoveItypes;
-  bool ForceItypes;
-#endif
-
-  bool DumpUnwritableChanges;
-  bool AllowUnwritableChanges;
-
-  bool AllowRewriteFailures;
-
-  bool ItypesForExtern;
-};
-
 // The main interface exposed by the 3C to interact with the tool.
 //
 // See clang/docs/checkedc/3C/clang-tidy.md#_3c-name-prefix

clang/include/clang/3C/3CGlobalOptions.h

@@ -15,29 +15,61 @@
 
 #include "llvm/Support/CommandLine.h"
 
-extern bool Verbose;
-extern bool DumpIntermediate;
-extern std::string OutputPostfix;
-extern std::string OutputDir;
-extern bool HandleVARARGS;
-extern bool SeperateMultipleFuncDecls;
-extern bool EnablePropThruIType;
-extern bool ConsiderAllocUnsafe;
-extern bool AllTypes;
-extern bool NewSolver;
-extern std::string BaseDir;
-extern std::vector<std::string> AllocatorFunctions;
-extern bool AddCheckedRegions;
-extern bool WarnRootCause;
-extern bool WarnAllRootCause;
-extern bool DumpUnwritableChanges;
-extern bool AllowUnwritableChanges;
-extern bool AllowRewriteFailures;
-extern bool ItypesForExtern;
+// Options used to initialize 3C tool.
+//
+// See clang/docs/checkedc/3C/clang-tidy.md#_3c-name-prefix
+// NOLINTNEXTLINE(readability-identifier-naming)
+struct _3COptions {
+  bool DumpIntermediate;
+
+  bool Verbose;
+
+  std::string OutputPostfix;
+  std::string OutputDir;
+
+  std::string ConstraintOutputJson;
+
+  bool DumpStats;
+
+  std::string StatsOutputJson;
+
+  std::string WildPtrInfoJson;
+
+  std::string PerWildPtrInfoJson;
+
+  std::vector<std::string> AllocatorFunctions;
+
+  bool HandleVARARGS;
+
+  bool EnablePropThruIType;
+
+  std::string BaseDir;
+  bool AllowSourcesOutsideBaseDir;
+
+  bool AllTypes;
+
+  bool AddCheckedRegions;
+
+  bool EnableCCTypeChecker;
+
+  bool WarnRootCause;
+
+  bool WarnAllRootCause;
 
 #ifdef FIVE_C
-extern bool RemoveItypes;
-extern bool ForceItypes;
+  bool RemoveItypes;
+  bool ForceItypes;
 #endif
 
+  bool DumpUnwritableChanges;
+  bool AllowUnwritableChanges;
+
+  bool AllowRewriteFailures;
+
+  bool ItypesForExtern;
+};
+
+// NOLINTNEXTLINE(readability-identifier-naming)
+extern struct _3COptions _3COpts;
+
 #endif // LLVM_CLANG_3C_3CGLOBALOPTIONS_H