fix fetcher & tests unused (#454)

belous-dp · web-flow · commit d98a8b19f691 · 2022-09-16T16:38:01.000+03:00
* unused fetcher field removed
* useless unit test removed
* bit fields tests updated
diff --git a/server/src/ReturnTypesFetcher.cpp b/server/src/ReturnTypesFetcher.cpp
@@ -10,7 +10,7 @@ void ReturnTypesFetcher::fetch(ProgressWriter *const progressWriter,
         testsMap[filePath];
     }
     Fetcher(Fetcher::Options::Value::RETURN_TYPE_NAMES_ONLY,
-                 testGen->getTargetBuildDatabase()->compilationDatabase, testsMap, nullptr, nullptr, nullptr,
+                 testGen->getTargetBuildDatabase()->compilationDatabase, testsMap, nullptr, nullptr,
                  testGen->compileCommandsJsonPath, false)
         .fetchWithProgress(progressWriter, "Fetching return types for functions", true);
     for (auto const &[sourceFilePath, test] : testsMap) {
diff --git a/server/src/Server.cpp b/server/src/Server.cpp
@@ -200,7 +200,7 @@ Status Server::TestsGenServiceImpl::ProcessBaseTestRequest(BaseTestGen &testGen,
         LOG_S(DEBUG) << logMessage;
         Fetcher fetcher(Fetcher::Options::Value::ALL,
                         testGen.getTargetBuildDatabase()->compilationDatabase, testGen.tests, &testGen.types,
-                        &sizeContext.pointerSize, &sizeContext.maximumAlignment,
+                        &sizeContext.maximumAlignment,
                         testGen.compileCommandsJsonPath, false);
         fetcher.fetchWithProgress(testGen.progressWriter, logMessage);
         SourceToHeaderRewriter(testGen.projectContext, testGen.getTargetBuildDatabase()->compilationDatabase,
@@ -552,7 +552,7 @@ Status Server::TestsGenServiceImpl::ProcessProjectStubsRequest(BaseTestGen *test
     LOG_S(DEBUG) << logMessage;
     Fetcher fetcher(Fetcher::Options::Value::TYPE | Fetcher::Options::Value::FUNCTION,
                     testGen->getTargetBuildDatabase()->compilationDatabase, testGen->tests, &testGen->types,
-                    &sizeContext.pointerSize, &sizeContext.maximumAlignment,
+                    &sizeContext.maximumAlignment,
                     testGen->compileCommandsJsonPath, false);
 
     fetcher.fetchWithProgress(testGen->progressWriter, logMessage);
diff --git a/server/src/Synchronizer.cpp b/server/src/Synchronizer.cpp
@@ -136,7 +136,8 @@ void Synchronizer::synchronizeStubs(StubSet &outdatedStubs,
     auto filesInFolder = Paths::findFilesInFolder(stubDirPath);
     auto presentStubs = CollectionUtils::transformTo<StubSet>(
     dropHeaders(filesInFolder), [this](const fs::path &stubPath) {
-        return StubOperator(Paths::stubPathToSourcePath(this->testGen->projectContext, stubPath), Paths::isHeaderFile(stubPath));
+        return StubOperator(Paths::stubPathToSourcePath(this->testGen->projectContext, stubPath),
+                            Paths::isHeaderFile(stubPath));
     });
     StubSet stubFiles = CollectionUtils::unionSet(allStubs, presentStubs);
     tests::TestsMap stubFilesMap, sourceFilesMap;
@@ -153,11 +154,10 @@ void Synchronizer::synchronizeStubs(StubSet &outdatedStubs,
 
     auto stubFetcher =
         Fetcher(options, testGen->getProjectBuildDatabase()->compilationDatabase, sourceFilesMap, &testGen->types,
-                &sizeContext->pointerSize, &sizeContext->maximumAlignment,
+                &sizeContext->maximumAlignment,
                 testGen->compileCommandsJsonPath, false);
 
-    stubFetcher.fetchWithProgress(testGen->progressWriter, "Finding source files required for stubs",
-                           true);
+    stubFetcher.fetchWithProgress(testGen->progressWriter, "Finding source files required for stubs", true);
 
     fs::path ccJsonStubDirPath =
             Paths::getUtbotBuildDir(testGen->projectContext) / "stubs_build_files";
diff --git a/server/src/fetchers/Fetcher.cpp b/server/src/fetchers/Fetcher.cpp
@@ -24,13 +24,12 @@ Fetcher::Fetcher(Options options,
                  const std::shared_ptr<CompilationDatabase> &compilationDatabase,
                  tests::TestsMap &tests,
                  types::TypeMaps *types,
-                 size_t *pointerSize,
                  size_t *maximumAlignment,
                  const fs::path &compileCommandsJsonPath,
                  bool fetchFunctionBodies)
-    : options(options), projectTests(&tests), projectTypes(types),
-      pointerSize(pointerSize), maximumAlignment(maximumAlignment),
-      fetchFunctionBodies(fetchFunctionBodies), clangToolRunner(compilationDatabase) {
+        : options(options), projectTests(&tests), projectTypes(types),
+          maximumAlignment(maximumAlignment), fetchFunctionBodies(fetchFunctionBodies),
+          clangToolRunner(compilationDatabase) {
     buildRootPath = Paths::subtractPath(compileCommandsJsonPath.string(), CompilationUtils::UTBOT_BUILD_DIR_NAME);
     if (options.has(Options::Value::TYPE)) {
         addMatcher<TypeDeclsMatchCallback>(anyTypeDeclarationMatcher);
@@ -83,6 +82,7 @@ void Fetcher::fetchWithProgress(const ProgressWriter *progressWriter,
 
 void Fetcher::postProcess() const {
     if (options.has(Options::Value::FUNCTION) && maximumAlignment != nullptr) {
+        // TODO maybe this is useless?
         for (auto projectTestsIterator = projectTests->begin();
              projectTestsIterator != projectTests->end(); projectTestsIterator++) {
             tests::Tests &tests = projectTestsIterator.value();
diff --git a/server/src/fetchers/Fetcher.h b/server/src/fetchers/Fetcher.h
@@ -59,7 +59,6 @@ class Fetcher {
                      const std::shared_ptr<CompilationDatabase> &compilationDatabase,
                      tests::TestsMap &tests,
                      types::TypeMaps *types,
-                     size_t *pointerSize,
                      size_t *maximumAlignment,
                      const fs::path &compileCommandsJsonPath,
                      bool fetchFunctionBodies);
@@ -76,7 +75,6 @@ class Fetcher {
 
     tests::TestsMap *const projectTests;
     types::TypeMaps *const projectTypes;
-    size_t *const pointerSize;
     size_t *const maximumAlignment;
     fs::path buildRootPath;
 
diff --git a/server/src/fetchers/TypeDeclsMatchCallback.cpp b/server/src/fetchers/TypeDeclsMatchCallback.cpp
@@ -14,7 +14,6 @@ TypeDeclsMatchCallback::TypeDeclsMatchCallback(const Fetcher *parent)
 void TypeDeclsMatchCallback::run(const MatchFinder::MatchResult &Result) {
     QualType pointerType = Result.Context->getPointerType(Result.Context->getWideCharType());
     uint64_t pointerSize = Result.Context->getTypeSize(pointerType) / 8;
-    *parent->pointerSize = pointerSize;
 
     ExecUtils::throwIfCancelled();
     checkStructDecl(Result);
diff --git a/server/src/stubs/StubGen.cpp b/server/src/stubs/StubGen.cpp
@@ -43,8 +43,7 @@ StubGen::findStubFilesBySignatures(const std::vector<tests::Tests::MethodDescrip
         stubFilesMap[file].sourceFilePath = file;
     }
     Fetcher::Options::Value options = Fetcher::Options::Value::FUNCTION_NAMES_ONLY;
-    Fetcher fetcher(options, stubsCdb, stubFilesMap, nullptr,
-                              nullptr, nullptr, ccJsonDirPath, true);
+    Fetcher fetcher(options, stubsCdb, stubFilesMap, nullptr, nullptr, ccJsonDirPath, true);
     fetcher.fetchWithProgress(testGen.progressWriter, "Finding stub files", true);
     CollectionUtils::FileSet stubFilesSet;
     auto signatureNamesSet = CollectionUtils::transformTo<std::unordered_set<std::string>>(
diff --git a/server/test/framework/Regression_Tests.cpp b/server/test/framework/Regression_Tests.cpp
@@ -197,21 +197,6 @@ namespace {
             "ret");
     }
 
-    TEST_F(Regression_Test, Unnamed_Bit_Field) {
-        fs::path source = getTestFilePath("PR124.c");
-        auto [testGen, status] = createTestForFunction(source, 8);
-
-        ASSERT_TRUE(status.ok()) << status.error_message();
-
-        checkTestCasePredicates(
-            testGen.tests.at(source).methods.begin().value().testCases,
-            std::vector<TestCasePredicate>(
-                { [](const tests::Tests::MethodTestCase &testCase) {
-                    return !testCase.isError();
-                } }),
-            "bpf_xdp_attach");
-    }
-
     TEST_F(Regression_Test, VaList_In_Function_Pointer_Type) {
         fs::path source = getTestFilePath("PR123.c");
         auto [testGen, status] = createTestForFunction(source, 7);
diff --git a/server/test/framework/Syntax_Tests.cpp b/server/test/framework/Syntax_Tests.cpp
diff --git a/server/test/suites/regression/CMakeLists.txt b/server/test/suites/regression/CMakeLists.txt
diff --git a/server/test/suites/regression/PR124.c b/server/test/suites/regression/PR124.c

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ void ReturnTypesFetcher::fetch(ProgressWriter *const progressWriter,`
`10`	`10`	`testsMap[filePath];`
`11`	`11`	`}`
`12`	`12`	`Fetcher(Fetcher::Options::Value::RETURN_TYPE_NAMES_ONLY,`
`13`		`- testGen->getTargetBuildDatabase()->compilationDatabase, testsMap, nullptr, nullptr, nullptr,`
	`13`	`+ testGen->getTargetBuildDatabase()->compilationDatabase, testsMap, nullptr, nullptr,`
`14`	`14`	`testGen->compileCommandsJsonPath, false)`
`15`	`15`	`.fetchWithProgress(progressWriter, "Fetching return types for functions", true);`
`16`	`16`	`for (auto const &[sourceFilePath, test] : testsMap) {`