Fix for issue 283 (round 2)

README.md

@@ -56,11 +56,7 @@ For more information on Checked C and pointers to example code, see our
 
 ## 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).
+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
 

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

@@ -48,12 +48,13 @@ void As3CCommands(const Diagnostic &D, std::vector<Command> &OutCommands) {
 }
 
 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);
+    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) {
+                    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._3CManualFix->ptrID;
@@ -67,6 +68,6 @@ bool Execute3CCommand(const ExecuteCommandParams &Params,
   }
   return false;
 }
-} // namespace clangd
-} // namespace clang
+}
+}
 #endif

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

@@ -17,16 +17,17 @@
 
 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);
+  // 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
+  // Interpret the provided execute command request as 3C command
+  // and execute them.
+  bool Execute3CCommand(const ExecuteCommandParams &Params,
+                        std::string &ReplyMessage,
+                        _3CInterface &CcInterface);
+}
+}
+#endif //LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CCOMMANDS_H
 #endif

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

@@ -25,12 +25,12 @@ static bool IsValidSourceFile(ConstraintsInfo &CCRes, std::string &FilePath) {
   return CCRes.ValidSourceFiles.find(FilePath) != CCRes.ValidSourceFiles.end();
 }
 
+
 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 {
+  auto GetLocRange = [](uint32_t Line, uint32_t ColNoS, uint32_t ColNoE) -> Range {
     Range nRange;
     Line--;
     nRange.start.line = Line;
@@ -60,8 +60,8 @@ bool _3CDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
       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.getWildPtrReason();
+      NewDiag.Message = "Pointer is wild because of:" +
+                        WReason.second.getWildPtrReason();
 
       // Create notes for the information about root cause.
       PersistentSourceLoc SL = WReason.second.getLocation();
@@ -110,11 +110,11 @@ bool _3CDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
             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.RootWildAtomsWithReason[tC].getWildPtrReason();
+            DiagNote.Message = Line.RootWildAtomsWithReason[tC].getWildPtrReason();
             if (MaxPtrReasons <= 1)
               DiagNote.Message += " (others)";
             NewDiag.Notes.push_back(DiagNote);
@@ -127,9 +127,10 @@ bool _3CDiagnostics::PopulateDiagsFromConstraintsInfo(ConstraintsInfo &Line) {
     }
   }
 
+
   return true;
 }
 
-} // namespace clangd
-} // namespace clang
+}
+}
 #endif

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

@@ -12,9 +12,9 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_3CDIAGNOSTICS_H
 
+#include <set>
 #include "Diagnostics.h"
 #include "clang/3C/3C.h"
-#include <set>
 
 namespace clang {
 namespace clangd {
@@ -33,12 +33,13 @@ class _3CDiagnostics {
   std::map<std::string, std::vector<Diag>> &GetAllFilesDiagnostics() {
     return AllFileDiagnostics;
   }
-
 private:
   // Diagnostics of all files.
   std::map<std::string, std::vector<Diag>> AllFileDiagnostics;
+
+
 };
-} // namespace clangd
-} // namespace clang
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_
+}
+}
+#endif //LLVM_CLANG_TOOLS_EXTRA_CLANGD_
 #endif

clang-tools-extra/clangd/ClangdLSPServer.cpp

@@ -398,7 +398,8 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
         llvm::json::Object{
             {"textDocumentSync", (int)TextDocumentSyncKind::Incremental},
             {"codeActionProvider", true},
-            {"codeLensProvider", llvm::json::Object{{"resolveProvider", true}}},
+            {"codeLensProvider", llvm::json::Object{
+                {"resolveProvider", true}}},
             {"executeCommandProvider",
              llvm::json::Object{
                  {"commands",
@@ -528,35 +529,40 @@ void ClangdLSPServer::onFileEvent(const DidChangeWatchedFilesParams &Params) {
 }
 
 #ifdef INTERACTIVE3C
-void ClangdLSPServer::_3CResultsReady(std::string FileName, bool ClearDiags) {
+void ClangdLSPServer::_3CResultsReady(std::string FileName,
+                                      bool ClearDiags) {
   // Get the diagnostics and update the client.
   std::vector<Diag> Diagnostics;
   Diagnostics.clear();
   if (!ClearDiags) {
     std::lock_guard<std::mutex> lock(Server->_3CDiagInfo.DiagMutex);
     auto &allDiags = Server->_3CDiagInfo.GetAllFilesDiagnostics();
-    if (allDiags.find(FileName) != allDiags.end()) {
-      Diagnostics.insert(Diagnostics.begin(), allDiags[FileName].begin(),
-                         allDiags[FileName].end());
+    if (allDiags.find(FileName) !=
+        allDiags.end()) {
+      Diagnostics.insert(
+          Diagnostics.begin(),
+          allDiags[FileName].begin(),
+          allDiags[FileName].end());
     }
   }
   this->onDiagnosticsReady(FileName, Diagnostics);
 }
 
 void ClangdLSPServer::send3CMessage(std::string MsgStr) {
-  // Send message as info to the client.
-  notify("window/showMessage", llvm::json::Object{
-                                   // Info message.
-                                   {"type", 3},
-                                   {"message", std::move(MsgStr)},
-                               });
+ // Send message as info to the client.
+  notify("window/showMessage",
+         llvm::json::Object{
+             // Info message.
+             {"type", 3},
+             {"message", std::move(MsgStr)},
+         });
 }
 #endif
 void ClangdLSPServer::onCommand(const ExecuteCommandParams &Params,
                                 Callback<llvm::json::Value> Reply) {
 #ifdef INTERACTIVE3C
   // In this mode, we support only 3C commands.
-  if (Is3CCommand(Params)) {
+  if(Is3CCommand(Params)) {
     Server->execute3CCommand(Params, this);
     Reply("3C Background work scheduled.");
   } else {
@@ -1143,6 +1149,7 @@ ClangdLSPServer::ClangdLSPServer(
   MsgHandler->bind("textDocument/didOpen", &ClangdLSPServer::onDocumentDidOpen);
   MsgHandler->bind("textDocument/didClose", &ClangdLSPServer::onDocumentDidClose);
   MsgHandler->bind("textDocument/didChange", &ClangdLSPServer::onDocumentDidChange);
+  // clang-format on
 #else
   MsgHandler->bind("initialize", &ClangdLSPServer::onInitialize);
   MsgHandler->bind("shutdown", &ClangdLSPServer::onShutdown);
@@ -1172,7 +1179,6 @@ ClangdLSPServer::ClangdLSPServer(
   MsgHandler->bind("textDocument/typeHierarchy", &ClangdLSPServer::onTypeHierarchy);
   MsgHandler->bind("typeHierarchy/resolve", &ClangdLSPServer::onResolveTypeHierarchy);
 #endif
-  // clang-format on
 }
 
 ClangdLSPServer::~ClangdLSPServer() = default;

clang-tools-extra/clangd/ClangdServer.cpp

@@ -24,8 +24,8 @@
 #include "refactor/Rename.h"
 #include "refactor/Tweak.h"
 #ifdef INTERACTIVE3C
-#include "3CCommands.h"
 #include "clang/3C/3C.h"
+#include "3CCommands.h"
 #endif
 #include "clang/Format/Format.h"
 #include "clang/Frontend/CompilerInstance.h"
@@ -122,10 +122,9 @@ ClangdServer::ClangdServer(const GlobalCompilationDatabase &CDB,
               DynamicIdx.get(), DiagConsumer, Opts.SemanticHighlighting),
           Opts.UpdateDebounce, Opts.RetentionPolicy)
 #ifdef INTERACTIVE3C
-      ,
-      _3CInter(_3CInterface)
+          , _3CInter(_3CInterface)
 #endif
-{
+  {
   // Adds an index to the stack, at higher priority than existing indexes.
   auto AddIndex = [&](SymbolIndex *Idx) {
     if (this->Index != nullptr) {
@@ -187,8 +186,8 @@ void ClangdServer::clear3CDiagsForAllFiles(ConstraintsInfo &CcInfo,
   }
 }
 
-void ClangdServer::_3CCollectAndBuildInitialConstraints(
-    _3CLSPCallBack *ConvCB) {
+void
+ClangdServer::_3CCollectAndBuildInitialConstraints(_3CLSPCallBack *ConvCB) {
   auto Task = [=]() {
     _3CDiagInfo.ClearAllDiags();
     ConvCB->send3CMessage("Running 3C for first time.");
@@ -213,7 +212,8 @@ void ClangdServer::execute3CCommand(ExecuteCommandParams Params,
     std::string RplMsg;
     auto &WildPtrsInfo = _3CInter.GetWILDPtrsInfo();
     auto &PtrSourceMap = WildPtrsInfo.AtomSourceMap;
-    if (PtrSourceMap.find(Params._3CManualFix->ptrID) != PtrSourceMap.end()) {
+    if (PtrSourceMap.find(Params._3CManualFix->ptrID) !=
+        PtrSourceMap.end()) {
       std::string PtrFileName =
           PtrSourceMap[Params._3CManualFix->ptrID]->getFileName();
       log("3C: File of the pointer {0}\n", PtrFileName);
@@ -242,8 +242,7 @@ void ClangdServer::_3CCloseDocument(std::string FileName) {
       log("3C: Finished writing back file: {0}\n", FileName);
     } else {
       log("3C: File not included during constraint solving phase. "
-          "Rewriting failed: {0}\n",
-          FileName);
+          "Rewriting failed: {0}\n", FileName);
     }
   };
   WorkScheduler.run("3C: Writing back file.", Task);

clang-tools-extra/clangd/ClangdServer.h

@@ -310,7 +310,8 @@ class ClangdServer {
   // collect and build initial set of constraints on the source
   // files.
 
-  void execute3CCommand(ExecuteCommandParams Params, _3CLSPCallBack *ConvCB);
+  void execute3CCommand(ExecuteCommandParams Params,
+                        _3CLSPCallBack *ConvCB);
 
   void _3CCollectAndBuildInitialConstraints(_3CLSPCallBack *ConvCB);
 
@@ -327,8 +328,7 @@ class ClangdServer {
              ArrayRef<tooling::Range> Ranges);
 
 #ifdef INTERACTIVE3C
-  void report3CDiagsForAllFiles(ConstraintsInfo &CcInfo,
-                                _3CLSPCallBack *ConvCB);
+  void report3CDiagsForAllFiles(ConstraintsInfo &CcInfo, _3CLSPCallBack *ConvCB);
   void clear3CDiagsForAllFiles(ConstraintsInfo &CcInfo, _3CLSPCallBack *ConvCB);
 #endif
 

clang-tools-extra/clangd/Protocol.cpp

@@ -560,7 +560,8 @@ bool fromJSON(const llvm::json::Value &Params, ExecuteCommandParams &R) {
 #ifdef INTERACTIVE3C
   if (R.command == ExecuteCommandParams::_3C_APPLY_ONLY_FOR_THIS ||
       R.command == ExecuteCommandParams::_3C_APPLY_FOR_ALL) {
-    return Args && Args->size() == 1 && fromJSON(Args->front(), R._3CManualFix);
+    return Args && Args->size() == 1 &&
+        fromJSON(Args->front(), R._3CManualFix);
   }
 #endif
   return false; // Unrecognized command.

clang-tools-extra/clangd/Protocol.h

@@ -817,25 +817,23 @@ llvm::json::Value toJSON(const CodeAction &);
 // A code lens represents a command that should be shown along with
 // source text, like the number of references, a way to run tests, etc.
 //
-//  A code lens is _unresolved_ when no command is associated to it. For
-//  performance reasons the creation of a code lens and resolving should be done
-//  in two stages.
+//  A code lens is _unresolved_ when no command is associated to it. For performance
+//  reasons the creation of a code lens and resolving should be done in two stages.
 //
 struct CodeLens {
-  /// The range in which this code lens is valid, should only span a single
-  /// line.
+  /// The range in which this code lens is valid, should only span a single line.
   Range range;
 
   /**
    * The command this code lens represents.
-   */
+  */
   llvm::Optional<Command> command;
 
   /**
    * A data entry field that is preserved on a code lens item between
    * a code lens and a code lens resolve request.
    */
-  // data?: any
+  //data?: any
 };
 
 llvm::json::Value toJSON(const CodeLens &);