Remaining edits that aren't worth automating.

Author: mattmccutchen-cci

README.md

@@ -66,7 +66,7 @@ wiki](https://github.com/Microsoft/checkedc-clang/wiki).
 |Debug X86 Windows| Checked C and clang regression tests|![Debug X86 Windows status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/211/badge)|
 |Debug X64 Windows| Checked C and clang regression tests| ![Debug X64 Windows status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/205/badge)|
 |Debug X64 Linux  | Checked C and clang regression tests| ![Debug X64 Linux status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/217/badge)|
-|Debug X64 Linux  | 3c (Checked C Convert tool) nightly tests| ![Nightly Sanity Tests](https://github.com/correctcomputation/checkedc-clang/workflows/Nightly%20Sanity%20Tests/badge.svg?branch=master)|
+|Debug X64 Linux  | 3C (Checked-C-Convert tool) nightly tests| ![Nightly Sanity Tests](https://github.com/correctcomputation/checkedc-clang/workflows/Nightly%20Sanity%20Tests/badge.svg?branch=master)|
 |Release X64 Linux| Checked C, clang, and LLVM nightly tests|![Release X64 Linux status](https://msresearch.visualstudio.com/_apis/public/build/definitions/f6454e27-a46c-49d9-8453-29d89d53d2f9/238/badge)|
 
 ## Contributing

clang-tools-extra/clangd/ClangdLSPServer.cpp

@@ -391,7 +391,7 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
   SupportsOffsetsInSignatureHelp = Params.capabilities.OffsetsInSignatureHelp;
 #ifdef INTERACTIVE3C
   // initialize our constraint building system.
-  log("Interactive CheckedC convert mode.\n");
+  log("Interactive 3C mode.\n");
   Server->_3CCollectAndBuildInitialConstraints(this);
   llvm::json::Object Result{
       {{"capabilities",

clang-tools-extra/clangd/tool/ClangdMain.cpp

@@ -283,7 +283,7 @@ static llvm::cl::list<std::string> TweakList(
 static llvm::cl::OptionCategory _3CCategory("3C",
                                                 "This is "
                                                 "an interactive version "
-                                                "of checked c convert "
+                                                "of 3C "
                                                 "tool.");
 
 static llvm::cl::opt<bool> DumpIntermediate("dump-intermediate",

clang/docs/checkedc/3C.md

@@ -1,4 +1,4 @@
-# Checked-C-Convert
+# 3C (Checked-C-Convert)
 
 
 This is a clang tool that tries to automatically convert `C` code to include `Checked

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

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// The main interface for invoking 3C or 3c tool.
+// The main interface for invoking 3C tool.
 // This provides various methods that can be used to access different
 // aspects of the 3C tool.
 //

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

@@ -10,7 +10,7 @@
 //  a >= b
 //  a implies b
 //
-// The Checked C converter tool performs type inference to identify locations
+// The 3C tool performs type inference to identify locations
 // where a C type might be replaced with a Checked C type. This interface
 // does the solving to figure out where those substitions might happen.
 //===----------------------------------------------------------------------===//

clang/include/clang/Basic/LangOptions.def

@@ -94,7 +94,7 @@ LANGOPT(CPlusPlus17       , 1, 0, "C++17")
 LANGOPT(CPlusPlus2a       , 1, 0, "C++2a")
 LANGOPT(ObjC              , 1, 0, "Objective-C")
 LANGOPT(CheckedC          , 1, 0, "Checked C extension")
-LANGOPT(_3C               , 1, 0, "Automated Checked C converter mode")
+LANGOPT(_3C               , 1, 0, "3C (Automated Checked C converter) mode")
 BENIGN_LANGOPT(ObjCDefaultSynthProperties , 1, 0,
                "Objective-C auto-synthesized properties")
 BENIGN_LANGOPT(EncodeExtendedBlockSig , 1, 0,

clang/include/clang/Driver/Options.td

@@ -785,6 +785,8 @@ def forder_file_instrumentation : Flag<["-"], "forder-file-instrumentation">,
     Group<f_Group>, Flags<[CC1Option, CoreOption]>,
     HelpText<"Generate instrumented code to collect order file into default.profraw file (overridden by '=' form of option or LLVM_PROFILE_FILE env var)">;
 
+def f3c_tool : Flag<["-"], "f3c-tool">, Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Enable 3C tool mode (supposed to be run by tools that needs only AST)">;
 def faddrsig : Flag<["-"], "faddrsig">, Group<f_Group>, Flags<[CoreOption, CC1Option]>,
   HelpText<"Emit an address-significance table">;
 def fno_addrsig : Flag<["-"], "fno-addrsig">, Group<f_Group>, Flags<[CoreOption]>,
@@ -801,8 +803,6 @@ def fcheckedc_extension : Flag<["-"], "fcheckedc-extension">, Group<f_Group>, Fl
   HelpText<"Accept Checked C extension">;
 def fno_checkedc_extension : Flag<["-"], "fno-checkedc-extension">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Do not accept Checked C extension">;
-def f3c_tool : Flag<["-"], "f3c-tool">, Group<f_Group>, Flags<[CC1Option]>,
-  HelpText<"Enable Checked C converter tool mode (supposed to be run by tools that needs only AST)">;
 def fdump_extracted_comparison_facts : Flag<["-"], "fdump-extracted-comparison-facts">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Dump extracted comparison facts">;
 def fdump_widened_bounds : Flag<["-"], "fdump-widened-bounds">, Group<f_Group>, Flags<[CC1Option]>,

clang/lib/Sema/SemaBounds.cpp

@@ -2104,7 +2104,7 @@ namespace {
                                    CheckedScopeSpecifier CSS,
                                    EquivExprSets *EquivExprs) {
 
-      // If we are running to Checked C converter (AST only) tool, then disable
+      // If we are running the 3C (AST only) tool, then disable
       // bounds checking.
       if (S.getLangOpts()._3C)
         return;

clang/tools/3c/utils/README.md

@@ -17,7 +17,7 @@ contains the commands to run the `3c` tool on individual source files.
 
 ### Example:
 ```
-python convert-commands.py --cc <path_to_compile_commands.json> -p <path_to_the_checked_c_convert_binary>
+python convert-commands.py --cc <path_to_compile_commands.json> -p <path_to_the_3c_binary>
 ```
 
 ### Generating `compile_commands.json`