apply changes from code review

Author: Vipul-Cariappa

include/clang/Interpreter/CppInterOp.h

@@ -428,8 +428,11 @@ namespace Cpp {
   CPPINTEROP_API std::vector<TCppScope_t> GetDatamembers(TCppScope_t scope);
 
   /// Gets all the Static Fields/Data Members of a Class
-  CPPINTEROP_API std::vector<TCppScope_t>
-  GetStaticDatamembers(TCppScope_t scope);
+  ///\param[in] scope - class
+  ///\param[out] funcs - vector of static data members
+  CPPINTEROP_API void
+  GetStaticDatamembers(TCppScope_t scope,
+                       std::vector<TCppScope_t>& datamembers);
 
   /// This is a Lookup function to be used specifically for data members.
   CPPINTEROP_API TCppScope_t LookupDatamember(const std::string& name,

lib/Interpreter/CppInterOp.cpp

@@ -1161,10 +1161,9 @@ namespace Cpp {
     return {};
   }
 
-  std::vector<TCppScope_t> GetStaticDatamembers(TCppScope_t scope) {
-    std::vector<TCppScope_t> datamembers;
+  void GetStaticDatamembers(TCppScope_t scope,
+                            std::vector<TCppScope_t>& datamembers) {
     GetClassDecls<VarDecl>(scope, datamembers);
-    return datamembers;
   }
 
   TCppScope_t LookupDatamember(const std::string& name, TCppScope_t parent) {

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -31,22 +31,26 @@ TEST(VariableReflectionTest, GetDatamembers) {
   GetAllTopLevelDecls(code, Decls);
   auto datamembers = Cpp::GetDatamembers(Decls[0]);
   auto datamembers1 = Cpp::GetDatamembers(Decls[1]);
-  auto static_datamembers = Cpp::GetStaticDatamembers(Decls[0]);
-  auto static_datamembers1 = Cpp::GetStaticDatamembers(Decls[1]);
 
-  // non static field first
+  // non static field
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[0]), "C::a");
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[1]), "C::c");
   EXPECT_EQ(Cpp::GetQualifiedName(datamembers[2]), "C::e");
   EXPECT_EQ(datamembers.size(), 3);
   EXPECT_EQ(datamembers1.size(), 0);
 
   // static fields
-  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[0]), "C::b");
-  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[1]), "C::d");
-  EXPECT_EQ(Cpp::GetQualifiedName(static_datamembers[2]), "C::f");
-  EXPECT_EQ(static_datamembers.size(), 3);
-  EXPECT_EQ(static_datamembers1.size(), 0);
+  datamembers.clear();
+  datamembers1.clear();
+
+  Cpp::GetStaticDatamembers(Decls[0], datamembers);
+  Cpp::GetStaticDatamembers(Decls[1], datamembers1);
+
+  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[0]), "C::b");
+  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[1]), "C::d");
+  EXPECT_EQ(Cpp::GetQualifiedName(datamembers[2]), "C::f");
+  EXPECT_EQ(datamembers.size(), 3);
+  EXPECT_EQ(datamembers1.size(), 0);
 }
 
 #define CODE                                                                   \