Implement checker config for summary configuration

Ericsson · Nov 10, 2022 · b76fcea · b76fcea
1 parent d256712
commit b76fcea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td b/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td
@@ -377,6 +377,11 @@ def StdCLibraryFunctionsChecker : Checker<"StdCLibraryFunctions">,
                   "If set to true, the checker models functions from the "
                   "POSIX standard.",
                   "false",
+                  InAlpha>,
+    CmdLineOption<String,
+                  "SummaryConfigPath",
+                  "The path of the config file in YAML format",
+                  "",
                   InAlpha>
   ]>,
   Documentation<NotDocumented>,

diff --git a/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp
@@ -774,6 +774,7 @@ class StdLibraryFunctionsChecker
   bool DisplayLoadedSummaries = false;
   bool ModelPOSIX = false;
   bool ShouldAssumeControlledEnvironment = false;
+  std::string SummaryConfigPath;
 
 private:
   Optional<Summary> findFunctionSummary(const FunctionDecl *FD,
@@ -1452,12 +1453,10 @@ void StdLibraryFunctionsChecker::initFunctionSummaries(
 
 // User-provided summary configuration.
 CheckerManager *Mgr = C.getAnalysisManager().getCheckerManager();
-std::string Option{"Config"};
-/*StringRef ConfigFile =
-      Mgr->getAnalyzerOptions().getCheckerStringOption(this, Option);*/
-StringRef ConfigFile = "/local/workspace/llvm-project/clang/test/Analysis/Inputs/fread-summary.yaml";
+std::string Option{"SummaryConfigPath"};
+      Mgr->getAnalyzerOptions().getCheckerStringOption(this, Option);
 llvm::Optional<SummaryConfiguration> Config =
-    getConfiguration<SummaryConfiguration>(*Mgr, this, Option, ConfigFile);
+    getConfiguration<SummaryConfiguration>(*Mgr, this, Option, SummaryConfigPath);
 llvm::errs() << "Config :" << Config.has_value() << "\n";
 
 auto GetTypeFromStr = [&](StringRef TypeName) {
@@ -3178,6 +3177,8 @@ void ento::registerStdCLibraryFunctionsChecker(CheckerManager &mgr) {
   Checker->ModelPOSIX = Opts.getCheckerBooleanOption(Checker, "ModelPOSIX");
   Checker->ShouldAssumeControlledEnvironment =
       Opts.ShouldAssumeControlledEnvironment;
+  Checker->SummaryConfigPath =
+      Opts.getCheckerStringOption(Checker, "SummaryConfigPath");
 }
 
 bool ento::shouldRegisterStdCLibraryFunctionsChecker(

diff --git a/clang/test/Analysis/std-c-library-functions-config.c b/clang/test/Analysis/std-c-library-functions-config.c
@@ -2,6 +2,7 @@
 // RUN: %clang_analyze_cc1 %s \
 // RUN:   -analyzer-checker=core \
 // RUN:   -analyzer-checker=apiModeling.StdCLibraryFunctions \
+// RUN:   -analyzer-config apiModeling.StdCLibraryFunctions:SummaryConfigPath="%S/Inputs/fread-summary.yaml" \
 // RUN:   -analyzer-checker=alpha.unix.StdCLibraryFunctionArgs \
 // RUN:   -analyzer-checker=debug.StdCLibraryFunctionsTester \
 // RUN:   -analyzer-checker=debug.ExprInspection \
@@ -12,6 +13,7 @@
 // RUN: %clang_analyze_cc1 %s \
 // RUN:   -analyzer-checker=core \
 // RUN:   -analyzer-checker=apiModeling.StdCLibraryFunctions \
+// RUN:   -analyzer-config apiModeling.StdCLibraryFunctions:SummaryConfigPath="%S/Inputs/fread-summary.yaml" \
 // RUN:   -analyzer-checker=alpha.unix.StdCLibraryFunctionArgs \
 // RUN:   -analyzer-checker=debug.StdCLibraryFunctionsTester \
 // RUN:   -analyzer-checker=debug.ExprInspection \