Merge from 3C

README.md

@@ -54,6 +54,14 @@ manual is
 For more information on Checked C and pointers to example code, see our
 [Wiki](https://github.com/Microsoft/checkedc/wiki).
 
+## 3C: Semi-automated conversion of C code to Checked C
+
+This repository includes a tool called 3C that partially automates the
+conversion of C code to Checked C. Here is [general information about the 3C
+software](clang/docs/checkedc/3C/README.md), including development status and
+how to contribute. Here are the [usage instructions for the `3c` command-line
+tool](clang/tools/3c/README.md).
+
 ## More information
 
 For more information on the Checked C clang compiler, see the [Checked C clang
@@ -66,6 +74,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)|
 |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/3CCommands.cpp

@@ -0,0 +1,72 @@
+//=--3CCommands.cpp-----------------------------------------------*- C++-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+// Implementation of 3C command helper methods.
+//===----------------------------------------------------------------------===//
+
+#ifdef INTERACTIVE3C
+#include "3CCommands.h"
+
+namespace clang {
+namespace clangd {
+
+#define _3CSOURCE "3C_RealWild"
+
+static bool getPtrIdFromDiagMessage(const Diagnostic &DiagMsg,
+                                    unsigned long &PtrId) {
+  if (DiagMsg.source.rfind(_3CSOURCE, 0) == 0) {
+    PtrId = atoi(DiagMsg.code.c_str());
+    return true;
+  }
+  return false;
+}
+
+void as3CCommands(const Diagnostic &D, std::vector<Command> &OutCommands) {
+  unsigned long PtrId;
+  if (getPtrIdFromDiagMessage(D, PtrId)) {
+    Command AllPtrsCmd;
+    _3CManualFix PtrFix;
+    PtrFix.PtrId = PtrId;
+    AllPtrsCmd.The3CManualFix = PtrFix;
+    Command SinglePtrCmd = AllPtrsCmd;
+
+    AllPtrsCmd.command = Command::_3C_APPLY_FOR_ALL;
+    AllPtrsCmd.title = "Make this pointer non-WILD and apply the "
+                       "same observation to all the pointers.";
+
+    OutCommands.push_back(AllPtrsCmd);
+
+    SinglePtrCmd.command = Command::_3C_APPLY_ONLY_FOR_THIS;
+    SinglePtrCmd.title = "Make ONLY this pointer non-WILD.";
+
+    OutCommands.push_back(SinglePtrCmd);
+  }
+}
+
+bool is3CCommand(const ExecuteCommandParams &Params) {
+  return (Params.command.rfind(Command::_3C_APPLY_ONLY_FOR_THIS, 0) == 0) ||
+         (Params.command.rfind(Command::_3C_APPLY_FOR_ALL, 0) == 0);
+}
+
+bool execute3CCommand(const ExecuteCommandParams &Params,
+                      std::string &ReplyMessage, _3CInterface &CcInterface) {
+  ReplyMessage = "Checked C Pointer Modified.";
+  if (Params.command.rfind(Command::_3C_APPLY_ONLY_FOR_THIS, 0) == 0) {
+    int PtrId = Params.The3CManualFix->PtrId;
+    CcInterface.makeSinglePtrNonWild(PtrId);
+    return true;
+  }
+  if (Params.command.rfind(Command::_3C_APPLY_FOR_ALL, 0) == 0) {
+    int PtrId = Params.The3CManualFix->PtrId;
+    CcInterface.invalidateWildReasonGlobally(PtrId);
+    return true;
+  }
+  return false;
+}
+} // namespace clangd
+} // namespace clang
+#endif

clang-tools-extra/clangd/3CCommands.h

@@ -0,0 +1,32 @@
+//=--3CCommands.h-------------------------------------------------*- C++-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+// Helper methods used to handle 3C commands.
+//===----------------------------------------------------------------------===//
+
+#ifdef INTERACTIVE3C
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
+
+#include "Protocol.h"
+#include "clang/3C/3C.h"
+
+namespace clang {
+namespace clangd {
+// Convert the provided Diagnostic into Commands.
+void as3CCommands(const Diagnostic &D, std::vector<Command> &OutCommands);
+// Check if the execute command request from the client is a 3C command.
+bool is3CCommand(const ExecuteCommandParams &Params);
+
+// Interpret the provided execute command request as 3C command
+// and execute them.
+bool execute3CCommand(const ExecuteCommandParams &Params,
+                      std::string &ReplyMessage, _3CInterface &CcInterface);
+} // namespace clangd
+} // namespace clang
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
+#endif

clang-tools-extra/clangd/CConvertDiagnostics.cpp → clang-tools-extra/clangd/3CDiagnostics.cpp

@@ -1,75 +1,75 @@
-//=--CConvertDiagnostics.cpp--------------------------------------*- C++-*-===//
+//=--3CDiagnostics.cpp--------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Implementation of CConvertDiagnostics methods
+// Implementation of _3CDiagnostics methods
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#include "CConvertDiagnostics.h"
+#ifdef INTERACTIVE3C
+#include "3CDiagnostics.h"
 
 namespace clang {
 namespace clangd {
 
 #define DEFAULT_PTRSIZE 4
 
-void CConvertDiagnostics::ClearAllDiags() {
+void _3CDiagnostics::clearAllDiags() {
   std::lock_guard<std::mutex> Lock(DiagMutex);
   AllFileDiagnostics.clear();
 }
 
-static bool IsValidSourceFile(ConstraintsInfo &CCRes, std::string &FilePath) {
+static bool isValidSourceFile(ConstraintsInfo &CCRes, std::string &FilePath) {
   return CCRes.ValidSourceFiles.find(FilePath) != CCRes.ValidSourceFiles.end();
 }
 
-
-bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
+bool _3CDiagnostics::populateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
   std::lock_guard<std::mutex> Lock(DiagMutex);
   std::set<ConstraintKey> ProcessedCKeys;
   ProcessedCKeys.clear();
-  auto GetLocRange = [](uint32_t Line, uint32_t ColNoS, uint32_t ColNoE) -> Range {
-    Range nRange;
+  auto GetLocRange = [](uint32_t Line, uint32_t ColNoS,
+                        uint32_t ColNoE) -> Range {
+    Range NRange;
     Line--;
-    nRange.start.line = Line;
-    nRange.end.line = Line;
-    nRange.start.character = ColNoS;
+    NRange.start.line = Line;
+    NRange.end.line = Line;
+    NRange.start.character = ColNoS;
     if (ColNoE > 0) {
-      nRange.end.character = ColNoE;
+      NRange.end.character = ColNoE;
     } else {
-      nRange.end.character = ColNoS + DEFAULT_PTRSIZE;
+      NRange.end.character = ColNoS + DEFAULT_PTRSIZE;
     }
-    return nRange;
+    return NRange;
   };
 
-  for (auto &WReason : Line.RealWildPtrsWithReasons) {
-    if (Line.PtrSourceMap.find(WReason.first) != Line.PtrSourceMap.end()) {
-      auto *PsInfo = Line.PtrSourceMap[WReason.first];
+  for (auto &WReason : Line.RootWildAtomsWithReason) {
+    if (Line.AtomSourceMap.find(WReason.first) != Line.AtomSourceMap.end()) {
+      auto *PsInfo = Line.AtomSourceMap[WReason.first];
       std::string FilePath = PsInfo->getFileName();
       // If this is not a file in a project? Then ignore.
-      if (!IsValidSourceFile(Line, FilePath))
+      if (!isValidSourceFile(Line, FilePath))
         continue;
 
       ProcessedCKeys.insert(WReason.first);
 
       Diag NewDiag;
       NewDiag.Range = GetLocRange(PsInfo->getLineNo(), PsInfo->getColSNo(),
                                   PsInfo->getColENo());
-      NewDiag.Source = Diag::CConvMain;
+      NewDiag.Source = Diag::_3CMain;
       NewDiag.Severity = DiagnosticsEngine::Level::Error;
-      NewDiag.code = std::to_string(WReason.first);
-      NewDiag.Message = "Pointer is wild because of:" +
-                        WReason.second.WildPtrReason;
+      NewDiag.Code = std::to_string(WReason.first);
+      NewDiag.Message =
+          "Pointer is wild because of:" + WReason.second.getWildPtrReason();
 
       // Create notes for the information about root cause.
-      if (WReason.second.IsValid) {
+      PersistentSourceLoc SL = WReason.second.getLocation();
+      if (SL.valid()) {
         Note DiagNote;
-        DiagNote.AbsFile = WReason.second.SourceFileName;
+        DiagNote.AbsFile = SL.getFileName();
         DiagNote.Range =
-            GetLocRange(WReason.second.LineNo, WReason.second.ColStartS,
-                        WReason.second.ColStartE);
+            GetLocRange(SL.getLineNo(), SL.getColSNo(), SL.getColENo());
         DiagNote.Message = "Go here to know the root cause for this.";
         NewDiag.Notes.push_back(DiagNote);
       }
@@ -78,43 +78,48 @@ bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line
   }
 
   // For non-direct wild pointers..update the reason and diag information.
-  for (auto NonWildCk : Line.TotalNonDirectWildPointers) {
+  for (auto NonWildCk : Line.TotalNonDirectWildAtoms) {
     if (ProcessedCKeys.find(NonWildCk) == ProcessedCKeys.end()) {
       ProcessedCKeys.insert(NonWildCk);
-      if (Line.PtrSourceMap.find(NonWildCk) != Line.PtrSourceMap.end()) {
-        auto *PsInfo = Line.PtrSourceMap[NonWildCk];
+      if (Line.AtomSourceMap.find(NonWildCk) != Line.AtomSourceMap.end()) {
+        auto *PsInfo = Line.AtomSourceMap[NonWildCk];
         std::string FilePath = PsInfo->getFileName();
         // If this is not a file in a project? Then ignore.
-        if (!IsValidSourceFile(Line, FilePath))
+        if (!isValidSourceFile(Line, FilePath))
           continue;
 
         ProcessedCKeys.insert(NonWildCk);
         Diag NewDiag;
         NewDiag.Range = GetLocRange(PsInfo->getLineNo(), PsInfo->getColSNo(),
                                     PsInfo->getColENo());
 
-        NewDiag.code = std::to_string(NonWildCk);
-        NewDiag.Source = Diag::CConvSec;
+        NewDiag.Code = std::to_string(NonWildCk);
+        NewDiag.Source = Diag::_3CSec;
         NewDiag.Severity = DiagnosticsEngine::Level::Warning;
         NewDiag.Message = "Pointer is wild because it transitively "
                           "depends on other pointer(s)";
 
         // find the pointer group
-        CVars &DirectWildPtrs = Line.GetRCVars(NonWildCk);
+        CVars &DirectWildPtrs = Line.getRCVars(NonWildCk);
 
         unsigned MaxPtrReasons = 4;
-        for (auto tC : DirectWildPtrs) {
+        for (auto TC : DirectWildPtrs) {
           Note DiagNote;
 
-          if (Line.PtrSourceMap.find(tC) != Line.PtrSourceMap.end()) {
-            PsInfo = Line.PtrSourceMap[tC];
+          if (Line.AtomSourceMap.find(TC) != Line.AtomSourceMap.end()) {
+            PsInfo = Line.AtomSourceMap[TC];
             FilePath = PsInfo->getFileName();
             DiagNote.AbsFile = FilePath;
-            DiagNote.Range =
-                GetLocRange(PsInfo->getLineNo(), PsInfo->getColSNo(),
-                            PsInfo->getColENo());
+            DiagNote.Range = GetLocRange(
+                PsInfo->getLineNo(), PsInfo->getColSNo(), PsInfo->getColENo());
             MaxPtrReasons--;
-            DiagNote.Message = Line.RealWildPtrsWithReasons[tC].WildPtrReason;
+            // NOTE: Matt changed [] to `at` to fix a compile error after the
+            // default constructor of WildPointerInferenceInfo was removed in
+            // 3c3098c8724889a12eba383dec9088094bced99c. Right now, we don't
+            // care because we're not running clangd3c at all, but if and when
+            // we revive it, we should consider whether this assumption is safe.
+            DiagNote.Message =
+                Line.RootWildAtomsWithReason.at(TC).getWildPtrReason();
             if (MaxPtrReasons <= 1)
               DiagNote.Message += " (others)";
             NewDiag.Notes.push_back(DiagNote);
@@ -127,10 +132,9 @@ bool CConvertDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line
     }
   }
 
-
   return true;
 }
 
-}
-}
-#endif
+} // namespace clangd
+} // namespace clang
+#endif

clang-tools-extra/clangd/CConvertDiagnostics.h → clang-tools-extra/clangd/3CDiagnostics.h

@@ -1,45 +1,47 @@
-//=--CConvertDiagnostics.h----------------------------------------*- C++-*-===//
+//=--3CDiagnostics.h----------------------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Class that handles CConv Diagnostic messages.
+// Class that handles 3C Diagnostic messages.
 //===----------------------------------------------------------------------===//
 
-#ifdef INTERACTIVECCCONV
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTDIAGNOSTICS_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_CCONVERTDIAGNOSTICS_H
+#ifdef INTERACTIVE3C
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
 
-#include <set>
 #include "Diagnostics.h"
-#include "clang/CConv/CConv.h"
+#include "clang/3C/3C.h"
+#include <set>
 
 namespace clang {
 namespace clangd {
 
-// Class that represents diagnostics messages specific to CConv.
-class CConvertDiagnostics {
+// Class that represents diagnostics messages specific to 3C.
+//
+// See clang/docs/checkedc/3C/clang-tidy.md#_3c-name-prefix
+// NOLINTNEXTLINE(readability-identifier-naming)
+class _3CDiagnostics {
 public:
   std::mutex DiagMutex;
 
   // GUARDED by DiagMutex
   // Populate diagnostics from the given disjoint set.
-  bool PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line);
+  bool populateDiagsFromConstraintsInfo(ConstraintsInfo &Line);
   // GUARDED by DiagMutex
   // Clear diagnostics of all files.
-  void ClearAllDiags();
-  std::map<std::string, std::vector<Diag>> &GetAllFilesDiagnostics() {
+  void clearAllDiags();
+  std::map<std::string, std::vector<Diag>> &getAllFilesDiagnostics() {
     return AllFileDiagnostics;
   }
+
 private:
   // Diagnostics of all files.
   std::map<std::string, std::vector<Diag>> AllFileDiagnostics;
-
-
 };
-}
-}
-#endif //LLVM_CLANG_TOOLS_EXTRA_CLANGD_
+} // namespace clangd
+} // namespace clang
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_
 #endif