refactoring after review 8

Author: Vladislav Kalugin

server/src/Server.cpp

@@ -210,7 +210,7 @@ Status Server::TestsGenServiceImpl::ProcessBaseTestRequest(BaseTestGen &testGen,
         testGen.progressWriter->writeProgress("Generating stub files", 0.0);
         StubGen stubGen(testGen);
 
-        Synchronizer synchronizer(&testGen, &stubGen, &sizeContext);
+        Synchronizer synchronizer(&testGen, &sizeContext);
         synchronizer.synchronize(typesHandler);
 
         std::shared_ptr<LineInfo> lineInfo = nullptr;
@@ -547,7 +547,6 @@ Status Server::TestsGenServiceImpl::ProcessProjectStubsRequest(BaseTestGen *test
                                                                StubsWriter *stubsWriter) {
     types::TypesHandler::SizeContext sizeContext;
     types::TypesHandler typesHandler{testGen->types, sizeContext};
-    StubGen stubGen(*testGen);
 
     static std::string logMessage = "Traversing sources AST tree and fetching declarations.";
     LOG_S(DEBUG) << logMessage;
@@ -557,7 +556,7 @@ Status Server::TestsGenServiceImpl::ProcessProjectStubsRequest(BaseTestGen *test
                     testGen->compileCommandsJsonPath, false);
 
     fetcher.fetchWithProgress(testGen->progressWriter, logMessage);
-    Synchronizer synchronizer(testGen, &stubGen, &sizeContext);
+    Synchronizer synchronizer(testGen, &sizeContext);
     synchronizer.synchronize(typesHandler);
     stubsWriter->writeResponse(testGen->synchronizedStubs, testGen->projectContext.testDirPath);
     return Status::OK;

server/src/Synchronizer.cpp

@@ -40,9 +40,8 @@ bool StubOperator::isHeader() const {
 }
 
 Synchronizer::Synchronizer(BaseTestGen *testGen,
-                           StubGen const *stubGen,
                            types::TypesHandler::SizeContext *sizeContext)
-    : testGen(testGen), stubGen(stubGen), sizeContext(sizeContext) {
+    : testGen(testGen), sizeContext(sizeContext) {
 }
 
 bool Synchronizer::isProbablyOutdated(const fs::path &srcFilePath) const {

server/src/Synchronizer.h

@@ -21,7 +21,6 @@ class StubOperator {
 
 class Synchronizer {
     BaseTestGen *const testGen;
-    StubGen const *const stubGen;
     types::TypesHandler::SizeContext *sizeContext;
 
     [[nodiscard]] CollectionUtils::FileSet getOutdatedSourcePaths() const;
@@ -53,7 +52,7 @@ class Synchronizer {
 
     static CollectionUtils::FileSet dropHeaders(const CollectionUtils::FileSet &files);
 
-    Synchronizer(BaseTestGen *testGen, StubGen const *stubGen, types::TypesHandler::SizeContext *sizeContext);
+    Synchronizer(BaseTestGen *testGen, types::TypesHandler::SizeContext *sizeContext);
 
     void synchronize(const types::TypesHandler &typesHandler);
 

server/src/building/Linker.cpp

@@ -410,32 +410,12 @@ static const std::string STUB_BITCODE_FILES_NAME = "STUB_BITCODE_FILES";
 static const std::string STUB_BITCODE_FILES = "$(STUB_BITCODE_FILES)";
 
 Result<CollectionUtils::FileSet> Linker::generateStubsMakefile(
-    const fs::path &root, const fs::path &outputFile, const fs::path &stubsMakefile) const {
-    ShellExecTask::ExecutionParameters nmCommand(
-        Paths::getLLVMnm(),
-        { "--print-file-name", "--undefined-only", "--just-symbol-name", outputFile });
-    auto [out, status, _] = ShellExecTask::runShellCommandTask(nmCommand, testGen.serverBuildDir);
-    if (status != 0) {
-        std::string errorMessage =
-            StringUtils::stringFormat("llvm-nm on %s failed: %s", outputFile, out);
-        LOG_S(ERROR) << errorMessage;
-        return errorMessage;
+        const fs::path &root, const fs::path &outputFile, const fs::path &stubsMakefile) const {
+    auto result = StubGen(testGen).getStubSetForObject(outputFile);
+    if (!result.isSuccess()) {
+        return result;
     }
-    auto symbols =
-        CollectionUtils::transform(StringUtils::split(out, '\n'), [](std::string const &line) {
-            return StringUtils::splitByWhitespaces(line).back();
-        });
-    CollectionUtils::erase_if(symbols, [](std::string const &symbol) {
-        return StringUtils::startsWith(symbol, "__ubsan") ||
-               StringUtils::startsWith(symbol, "klee_");
-    });
-    auto signatures = CollectionUtils::transform(symbols, [](std::string const &symbol) {
-        Tests::MethodDescription methodDescription;
-        methodDescription.name = symbol;
-        return methodDescription;
-    });
-    auto rootLinkUnitInfo = testGen.getTargetBuildDatabase()->getClientLinkUnitInfo(root);
-    auto stubsSet = StubGen(testGen).findStubFilesBySignatures(signatures);
+    auto stubsSet = result.getOpt().value();
     printer::DefaultMakefilePrinter makefilePrinter;
     auto bitcodeStubFiles = CollectionUtils::transformTo<std::vector<fs::path>>(
         Synchronizer::dropHeaders(stubsSet), [this, &makefilePrinter](const fs::path &stubPath) {

server/src/stubs/StubGen.cpp

@@ -8,7 +8,8 @@
 #include "clang-utils/SourceToHeaderRewriter.h"
 #include "printers/CCJsonPrinter.h"
 #include "streams/stubs/StubsWriter.h"
-
+#include "loguru.h"
+#include "environment/EnvironmentPaths.h"
 
 StubGen::StubGen(BaseTestGen &testGen) : testGen(testGen) {
 }
@@ -99,3 +100,30 @@ bool StubGen::cmpMethodsDecl(const Tests::MethodDescription &decl1,
     }
     return true;
 }
+
+Result<CollectionUtils::FileSet> StubGen::getStubSetForObject(const fs::path &objectFilePath) {
+    ShellExecTask::ExecutionParameters nmCommand(
+            Paths::getLLVMnm(),
+            { "--print-file-name", "--undefined-only", "--just-symbol-name", objectFilePath });
+    auto [out, status, _] = ShellExecTask::runShellCommandTask(nmCommand, testGen.serverBuildDir);
+    if (status != 0) {
+        std::string errorMessage =
+                StringUtils::stringFormat("llvm-nm on %s failed: %s", objectFilePath, out);
+        LOG_S(ERROR) << errorMessage;
+        return errorMessage;
+    }
+    auto symbols =
+            CollectionUtils::transform(StringUtils::split(out, '\n'), [](std::string const &line) {
+                return StringUtils::splitByWhitespaces(line).back();
+            });
+    CollectionUtils::erase_if(symbols, [](std::string const &symbol) {
+        return StringUtils::startsWith(symbol, "__ubsan") ||
+               StringUtils::startsWith(symbol, "klee_");
+    });
+    auto signatures = CollectionUtils::transform(symbols, [](std::string const &symbol) {
+        Tests::MethodDescription methodDescription;
+        methodDescription.name = symbol;
+        return methodDescription;
+    });
+    return findStubFilesBySignatures(signatures);
+}

server/src/stubs/StubGen.h

@@ -21,6 +21,7 @@ class StubGen {
     static tests::Tests mergeSourceFileIntoStub(const tests::Tests &methodDescription,
                                                 const tests::Tests &srcFile);
 
+    Result<CollectionUtils::FileSet> getStubSetForObject(const fs::path &objectFilePath);
 private:
     BaseTestGen &testGen;
 

server/test/framework/Stub_Tests.cpp

@@ -168,6 +168,16 @@ namespace {
         Status status = Server::TestsGenServiceImpl::ProcessBaseTestRequest(testGen, writer.get());
         ASSERT_TRUE(status.ok()) << status.error_message();
         EXPECT_EQ(testUtils::getNumberOfTests(testGen.tests), 2);
+
+        const fs::path objectFile = testGen.getClientCompilationUnitInfo(foreign_bar_c)->getOutputFile();
+        auto result = StubGen(testGen).getStubSetForObject(objectFile);
+        ASSERT_TRUE(result.isSuccess());
+        auto stubCandidates = {calc_sum_c};
+        auto expectedStubFiles = CollectionUtils::transformTo<CollectionUtils::FileSet>(
+                stubCandidates, [&testGen](fs::path const &path) {
+                    return Paths::sourcePathToStubPath(testGen.projectContext, path);
+                });
+        EXPECT_EQ(expectedStubFiles, result.getOpt().value());
     }
 
     TEST_F(Stub_Test, File_Tests_With_Stubs) {