store string in function summary

Author: isuckatcs

clang/include/clang/Summary/SummaryContext.h

@@ -7,18 +7,18 @@
 
 namespace clang {
 class FunctionSummary {
-  SmallVector<char> ID;
+  std::string ID;
   std::set<const SummaryAttr *> Attrs;
-  std::set<SmallVector<char>> Calls;
+  std::set<std::string> Calls;
   bool CallsOpaque;
 
 public:
-  FunctionSummary(SmallVector<char> ID, std::set<const SummaryAttr *> Attrs,
-                  std::set<SmallVector<char>> Calls, bool CallsOpaque);
+  FunctionSummary(std::string ID, std::set<const SummaryAttr *> Attrs,
+                  std::set<std::string> Calls, bool CallsOpaque);
 
-  SmallVector<char> getID() const { return ID; }
+  StringRef getID() const { return ID; }
   const std::set<const SummaryAttr *> &getAttributes() const { return Attrs; }
-  const std::set<SmallVector<char>> &getCalls() const { return Calls; }
+  const std::set<std::string> &getCalls() const { return Calls; }
   bool callsOpaqueObject() const { return CallsOpaque; }
 
   template <typename T> bool hasAttribute() const {
@@ -37,14 +37,14 @@ class FunctionSummary {
 
 class SummaryContext {
 public:
-  std::map<SmallVector<char>, const FunctionSummary *> IDToSummary;
+  std::map<StringRef, const FunctionSummary *> IDToSummary;
   std::vector<std::unique_ptr<FunctionSummary>> FunctionSummaries;
 
   std::map<SummaryAttrKind, const SummaryAttr *> KindToAttribute;
   std::vector<std::unique_ptr<SummaryAttr>> Attributes;
 
-  void CreateSummary(SmallVector<char> ID, std::set<const SummaryAttr *> Attrs,
-                     std::set<SmallVector<char>> Calls, bool CallsOpaque);
+  void CreateSummary(std::string ID, std::set<const SummaryAttr *> Attrs,
+                     std::set<std::string> Calls, bool CallsOpaque);
   bool ReduceFunctionSummary(FunctionSummary &FunctionSummary);
 
   template <typename T> void registerAttr();

clang/lib/Summary/SummaryContext.cpp

@@ -7,14 +7,14 @@
 
 namespace clang {
 namespace {
-SmallVector<char> GetUSR(const FunctionDecl *FD) {
-  SmallVector<char> USR;
+std::string GetUSR(const FunctionDecl *FD) {
+  SmallString<32> USR;
   index::generateUSRForDecl(FD, USR);
-  return USR;
+  return USR.str().str();
 }
 
 class CallCollector : public ast_matchers::MatchFinder::MatchCallback {
-  std::set<SmallVector<char>> Calls;
+  std::set<std::string> Calls;
   bool callsOpaqueSymbol = false;
 
   virtual void
@@ -44,7 +44,7 @@ class CallCollector : public ast_matchers::MatchFinder::MatchCallback {
   }
 
 public:
-  std::pair<std::set<SmallVector<char>>, bool> collect(const FunctionDecl *FD) {
+  std::pair<std::set<std::string>, bool> collect(const FunctionDecl *FD) {
     using namespace ast_matchers;
     MatchFinder Finder;
 
@@ -57,9 +57,9 @@ class CallCollector : public ast_matchers::MatchFinder::MatchCallback {
 };
 } // namespace
 
-FunctionSummary::FunctionSummary(SmallVector<char> ID,
+FunctionSummary::FunctionSummary(std::string ID,
                                  std::set<const SummaryAttr *> FunctionAttrs,
-                                 std::set<SmallVector<char>> Calls,
+                                 std::set<std::string> Calls,
                                  bool CallsOpaque)
     : ID(std::move(ID)), Attrs(std::move(FunctionAttrs)),
       Calls(std::move(Calls)), CallsOpaque(CallsOpaque) {}
@@ -79,9 +79,9 @@ SummaryContext::SummaryContext() {
   registerAttr<NoWritePtrParameterAttr>();
 }
 
-void SummaryContext::CreateSummary(SmallVector<char> ID,
+void SummaryContext::CreateSummary(std::string ID,
                                    std::set<const SummaryAttr *> Attrs,
-                                   std::set<SmallVector<char>> Calls,
+                                   std::set<std::string> Calls,
                                    bool CallsOpaque) {
   if (IDToSummary.count(ID))
     return;
@@ -116,7 +116,7 @@ void SummaryContext::ParseSummaryFromJSON(const llvm::json::Array &Summary) {
   for (auto it = Summary.begin(); it != Summary.end(); ++it) {
     const llvm::json::Object *FunctionSummary = it->getAsObject();
 
-    SmallString<128> ID(*FunctionSummary->getString("id"));
+    std::string ID = FunctionSummary->getString("id")->str();
     std::set<const SummaryAttr *> FunctionAttrs;
     const llvm::json::Array *FunctionAttributes =
         FunctionSummary->getObject("attrs")->getArray("function");
@@ -128,15 +128,15 @@ void SummaryContext::ParseSummaryFromJSON(const llvm::json::Array &Summary) {
       }
     }
 
-    std::set<SmallVector<char>> Calls;
+    std::set<std::string> Calls;
     const llvm::json::Object *CallsObject = FunctionSummary->getObject("calls");
     bool callsOpaue = *CallsObject->getBoolean("opaque");
 
     const llvm::json::Array *CallEntries = CallsObject->getArray("functions");
     for (auto callIt = CallEntries->begin(); callIt != CallEntries->end();
          ++callIt) {
       auto *Obj = callIt->getAsObject();
-      Calls.emplace(SmallString<128>(*Obj->getString("id")));
+      Calls.emplace(Obj->getString("id")->str());
     }
 
     CreateSummary(std::move(ID), std::move(FunctionAttrs), std::move(Calls),