refactor Cpp::GetAllCppNames

Author: Vipul-Cariappa

include/clang/Interpreter/CppInterOp.h

@@ -12,6 +12,7 @@
 
 #include <cassert>
 #include <cstdint>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -668,7 +669,8 @@ namespace Cpp {
                             const std::vector<TemplateArgInfo>& explicit_types,
                             const std::vector<TemplateArgInfo>& arg_types);
 
-  CPPINTEROP_API std::vector<std::string> GetAllCppNames(TCppScope_t scope);
+  CPPINTEROP_API void GetAllCppNames(TCppScope_t scope,
+                                     std::set<std::string>& names);
 
   CPPINTEROP_API void DumpScope(TCppScope_t scope);
 

lib/Interpreter/CppInterOp.cpp

@@ -34,6 +34,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_os_ostream.h"
 
+#include <set>
 #include <sstream>
 #include <string>
 
@@ -3108,7 +3109,7 @@ namespace Cpp {
     return nullptr;
   }
 
-  std::vector<std::string> GetAllCppNames(TCppScope_t scope) {
+  void GetAllCppNames(TCppScope_t scope, std::set<std::string>& names) {
     auto *D = (clang::Decl *)scope;
     clang::DeclContext *DC;
     clang::DeclContext::decl_iterator decl;
@@ -3124,17 +3125,14 @@ namespace Cpp {
       DC = clang::TranslationUnitDecl::castToDeclContext(TUD);
       decl = DC->decls_begin();
     } else {
-      return {};
+      return;
     }
 
-    std::vector<std::string> names;
     for (/* decl set above */; decl != DC->decls_end(); decl++) {
       if (auto *ND = llvm::dyn_cast_or_null<NamedDecl>(*decl)) {
-        names.push_back(ND->getNameAsString());
+        names.insert(ND->getNameAsString());
       }
     }
-
-    return names;
   }
 
   void GetEnums(TCppScope_t scope, std::vector<std::string>& Result) {

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -716,14 +716,16 @@ TEST(ScopeReflectionTest, GetAllCppNames) {
 
   GetAllTopLevelDecls(code, Decls);
 
-  auto test_get_all_cpp_names = [](Decl *D, const std::vector<std::string> &truth_names) {
-    auto names = Cpp::GetAllCppNames(D);
-    EXPECT_EQ(names.size(), truth_names.size());
-
-    for (unsigned i = 0; i < truth_names.size() && i < names.size(); i++) {
-      EXPECT_EQ(names[i], truth_names[i]);
-    }
-  };
+  auto test_get_all_cpp_names =
+      [](Decl* D, const std::vector<std::string>& truth_names) {
+        std::set<std::string> names;
+        Cpp::GetAllCppNames(D, names);
+        EXPECT_EQ(names.size(), truth_names.size());
+
+        for (unsigned i = 0; i < truth_names.size() && i < names.size(); i++) {
+          EXPECT_TRUE(names.find(truth_names[i]) != names.end());
+        }
+      };
 
   test_get_all_cpp_names(Decls[0], {"a"});
   test_get_all_cpp_names(Decls[1], {"b"});