diff --git a/clang/include/clang/CrossTU/CrossTranslationUnit.h b/clang/include/clang/CrossTU/CrossTranslationUnit.h --- a/clang/include/clang/CrossTU/CrossTranslationUnit.h +++ b/clang/include/clang/CrossTU/CrossTranslationUnit.h @@ -20,6 +20,8 @@ #include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringMap.h" +#include "llvm/IR/DiagnosticInfo.h" +#include "llvm/IR/OperandTraits.h" #include "llvm/Support/Error.h" namespace clang { @@ -33,6 +35,10 @@ class NamedDecl; class TranslationUnitDecl; +namespace tooling { +class JSONCompilationDatabase; +} + namespace cross_tu { enum class index_error_code { @@ -42,12 +48,14 @@ multiple_definitions, missing_definition, failed_import, + failed_to_load_compilation_database, failed_to_get_external_ast, failed_to_generate_usr, triple_mismatch, lang_mismatch, lang_dialect_mismatch, - load_threshold_reached + load_threshold_reached, + ambiguous_compile_commands_database }; class IndexError : public llvm::ErrorInfo { @@ -86,7 +94,7 @@ /// \return Returns a map where the USR is the key and the filepath is the value /// or an error. llvm::Expected> -parseCrossTUIndex(StringRef IndexPath, StringRef CrossTUDir); +parseCrossTUIndex(StringRef IndexPath); std::string createCrossTUIndexString(const llvm::StringMap &Index); @@ -209,14 +217,45 @@ /// imported the FileID. ImportedFileIDMap ImportedFileIDs; - /// Functor for loading ASTUnits from AST-dump files. - class ASTFileLoader { + using LoadResultTy = llvm::Expected>; + + struct ASTLoader { + /// Load the ASTUnit by an identifier. Subclasses should determine what this + /// would be. + virtual LoadResultTy load(StringRef Identifier) = 0; + virtual ~ASTLoader() = default; + }; + + /// Implementation for loading ASTUnits from AST-dump files. + class ASTFileLoader : public ASTLoader { public: - ASTFileLoader(const CompilerInstance &CI); - std::unique_ptr operator()(StringRef ASTFilePath); + explicit ASTFileLoader(CompilerInstance &CI, StringRef CTUDir); + + /// ASTFileLoader uses a the path of the dump file as Identifier. + LoadResultTy load(StringRef Identifier) override; private: - const CompilerInstance &CI; + CompilerInstance &CI; + StringRef CTUDir; + }; + + /// Implementation for loading ASTUnits by parsing them on-demand. + class ASTOnDemandLoader : public ASTLoader { + public: + ASTOnDemandLoader(CompilerInstance &CI, StringRef OnDemandParsingDatabase); + + /// ASTOnDemandLoader uses the path of the source file to be parsed as + /// Identifier. + LoadResultTy load(StringRef Identifier) override; + + llvm::Error lazyInitCompileCommands(); + + private: + CompilerInstance &CI; + StringRef OnDemandParsingDatabase; + /// In case of on-demand parsing, the compilation database is parsed and + /// stored. + std::unique_ptr CompileCommands; }; /// Maintain number of AST loads and check for reaching the load limit. @@ -242,7 +281,7 @@ /// are the concerns of ASTUnitStorage class. class ASTUnitStorage { public: - ASTUnitStorage(const CompilerInstance &CI); + ASTUnitStorage(CompilerInstance &CI); /// Loads an ASTUnit for a function. /// /// \param FunctionName USR name of the function. @@ -287,18 +326,16 @@ using IndexMapTy = BaseMapTy; IndexMapTy NameFileMap; - ASTFileLoader FileAccessor; + std::unique_ptr Loader; - /// Limit the number of loaded ASTs. Used to limit the memory usage of the - /// CrossTranslationUnitContext. - /// The ASTUnitStorage has the knowledge about if the AST to load is - /// actually loaded or returned from cache. This information is needed to - /// maintain the counter. + /// Limit the number of loaded ASTs. It is used to limit the memory usage + /// of the CrossTranslationUnitContext. The ASTUnitStorage has the + /// information whether the AST to load is actually loaded or returned from + /// cache. This information is needed to maintain the counter. ASTLoadGuard LoadGuard; }; ASTUnitStorage ASTStorage; - }; } // namespace cross_tu diff --git a/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def b/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def --- a/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def +++ b/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def @@ -377,6 +377,21 @@ "the name of the file containing the CTU index of definitions.", "externalDefMap.txt") +ANALYZER_OPTION(bool, CTUOnDemandParsing, "ctu-on-demand-parsing", + "Whether to parse function definitions from external TUs in " + "an on-demand manner during analysis. When using on-demand " + "parsing there is no need for pre-dumping ASTs. External " + "definition mapping is still needed, and a valid compilation " + "database with compile commands for the external TUs is also " + "necessary. Disabled by default.", + false) + +ANALYZER_OPTION(StringRef, CTUOnDemandParsingDatabase, + "ctu-on-demand-parsing-database", + "The path to the compilation database used for on-demand " + "parsing of ASTs during CTU analysis.", + "compile_commands.json") + ANALYZER_OPTION( StringRef, ModelPath, "model-path", "The analyzer can inline an alternative implementation written in C at the " diff --git a/clang/lib/CrossTU/CMakeLists.txt b/clang/lib/CrossTU/CMakeLists.txt --- a/clang/lib/CrossTU/CMakeLists.txt +++ b/clang/lib/CrossTU/CMakeLists.txt @@ -10,4 +10,5 @@ clangBasic clangFrontend clangIndex + clangTooling ) diff --git a/clang/lib/CrossTU/CrossTranslationUnit.cpp b/clang/lib/CrossTU/CrossTranslationUnit.cpp --- a/clang/lib/CrossTU/CrossTranslationUnit.cpp +++ b/clang/lib/CrossTU/CrossTranslationUnit.cpp @@ -18,12 +18,16 @@ #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Index/USRGeneration.h" -#include "llvm/ADT/Triple.h" +#include "clang/Tooling/JSONCompilationDatabase.h" +#include "clang/Tooling/Tooling.h" +#include "llvm/ADT/Optional.h" #include "llvm/ADT/Statistic.h" +#include "llvm/ADT/Triple.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" +#include #include #include @@ -100,6 +104,8 @@ return "Failed to import the definition."; case index_error_code::failed_to_get_external_ast: return "Failed to load external AST source."; + case index_error_code::failed_to_load_compilation_database: + return "Failed to load compilation database."; case index_error_code::failed_to_generate_usr: return "Failed to generate USR."; case index_error_code::triple_mismatch: @@ -110,6 +116,9 @@ return "Language dialect mismatch"; case index_error_code::load_threshold_reached: return "Load threshold reached"; + case index_error_code::ambiguous_compile_commands_database: + return "Compile commands database contains multiple references to the " + "same sorce file."; } llvm_unreachable("Unrecognized index_error_code."); } @@ -129,7 +138,7 @@ } llvm::Expected> -parseCrossTUIndex(StringRef IndexPath, StringRef CrossTUDir) { +parseCrossTUIndex(StringRef IndexPath) { std::ifstream ExternalMapFile{std::string(IndexPath)}; if (!ExternalMapFile) return llvm::make_error(index_error_code::missing_index_file, @@ -147,9 +156,7 @@ return llvm::make_error( index_error_code::multiple_definitions, IndexPath.str(), LineNo); StringRef FileName = LineRef.substr(Pos + 1); - SmallString<256> FilePath = CrossTUDir; - llvm::sys::path::append(FilePath, FileName); - Result[LookupName] = std::string(FilePath); + Result[LookupName] = FileName.str(); } else return llvm::make_error( index_error_code::invalid_index_format, IndexPath.str(), LineNo); @@ -341,12 +348,12 @@ } } -CrossTranslationUnitContext::ASTFileLoader::ASTFileLoader( - const CompilerInstance &CI) - : CI(CI) {} +CrossTranslationUnitContext::ASTFileLoader::ASTFileLoader(CompilerInstance &CI, + StringRef CTUDir) + : CI(CI), CTUDir(CTUDir) {} -std::unique_ptr -CrossTranslationUnitContext::ASTFileLoader::operator()(StringRef ASTFilePath) { +CrossTranslationUnitContext::LoadResultTy +CrossTranslationUnitContext::ASTFileLoader::load(StringRef Identifier) { // Load AST from ast-dump. IntrusiveRefCntPtr DiagOpts = new DiagnosticOptions(); TextDiagnosticPrinter *DiagClient = @@ -355,16 +362,121 @@ IntrusiveRefCntPtr Diags( new DiagnosticsEngine(DiagID, &*DiagOpts, DiagClient)); + llvm::SmallString<256> AbsPath = CTUDir; + llvm::sys::path::append(AbsPath, Identifier); + return ASTUnit::LoadFromASTFile( - std::string(ASTFilePath), CI.getPCHContainerOperations()->getRawReader(), - ASTUnit::LoadEverything, Diags, CI.getFileSystemOpts()); + std::string(AbsPath.str()), + CI.getPCHContainerOperations()->getRawReader(), ASTUnit::LoadEverything, + Diags, CI.getFileSystemOpts()); +} + +/// Load the AST from a source-file, which is supposed to be located inside the +/// compilation database \p OnDemandParsingCommands. The compilation database +/// can contain the path of the file under the key "file" as an absolute path, +/// or as a relative path. When emitting diagnostics, plist files may contain +/// references to a location in a TU, that is different from the main TU. In +/// such cases, the file path emitted by the DiagnosticEngine is based on how +/// the exact invocation is assembled inside the ClangTool, which performs the +/// building of the ASTs. In order to ensure absolute paths inside the +/// diagnostics, we use the ArgumentsAdjuster API of ClangTool to make sure that +/// the invocation inside ClangTool is always made with an absolute path. \p +/// ASTSourcePath is assumed to be the lookup-name of the file, which comes from +/// the Index. The Index is built by the \p clang-extdef-mapping tool, which is +/// supposed to generate absolute paths. +/// +/// We must have absolute paths inside the plist, because otherwise we would +/// not be able to parse the bug, because we could not find the files with +/// relative paths. The directory of one entry in the compilation db may be +/// different from the directory where the plist is interpreted. +/// +/// Note that as the ClangTool is instantiated with a lookup-vector, which +/// contains a single entry; the supposedly absolute path of the source file. +/// So, the ArgumentAdjuster will only be used on the single corresponding +/// invocation. This guarantees that even if two files match in name, but +/// differ in location, only the correct one's invocation will be handled. This +/// is due to the fact that the lookup is done correctly inside the +/// OnDemandParsingDatabase, so it works for already absolute paths given under +/// the "file" entry of the compilation database, but also if a relative path is +/// given. In such a case, the lookup uses the "directory" entry as well to +/// identify the correct file. +CrossTranslationUnitContext::LoadResultTy +CrossTranslationUnitContext::ASTOnDemandLoader::load(StringRef Identifier) { + + if (auto InitError = lazyInitCompileCommands()) + return std::move(InitError); + + using namespace tooling; + + SmallVector Files; + Files.push_back(std::string(Identifier)); + ClangTool Tool(*CompileCommands, Files, CI.getPCHContainerOperations()); + + /// Lambda filter designed to find the source file argument inside an + /// invocation used to build the ASTs, and replace it with its absolute path + /// equivalent. + auto SourcePathNormalizer = [Identifier](const CommandLineArguments &Args, + StringRef FileName) { + /// Match the argument to the absolute path by checking whether it is a + /// postfix. + auto IsPostfixOfLookup = [Identifier](const std::string &Arg) { + return Identifier.rfind(Arg) != llvm::StringRef::npos; + }; + + /// Commandline arguments are modified, and the API dictates the return of + /// a new instance, so copy the original. + CommandLineArguments Result{Args}; + + /// Search for the source file argument. Start from the end as a heuristic, + /// as most invocations tend to contain the source file argument in their + /// latter half. Only the first match is replaced. + auto SourceFilePath = + std::find_if(Result.rbegin(), Result.rend(), IsPostfixOfLookup); + + /// If source file argument could not been found, return the original + /// CommandlineArgumentsInstance. + if (SourceFilePath == Result.rend()) + return Result; + + /// Overwrite the argument with the \p ASTSourcePath, as it is assumed to + /// be the absolute path of the file. + *SourceFilePath = Identifier.str(); + + return Result; + }; + + Tool.appendArgumentsAdjuster(std::move(SourcePathNormalizer)); + + std::vector> ASTs; + Tool.buildASTs(ASTs); + + /// There is an assumption that the compilation database does not contain + /// multiple entries for the same source file. + if (ASTs.size() > 1) + return llvm::make_error( + index_error_code::ambiguous_compile_commands_database); + + /// Ideally there is exactly one entry in the compilation database that + /// matchse the source file. + if (ASTs.size() != 1) + return llvm::make_error( + index_error_code::failed_to_get_external_ast); + + ASTs[0]->enableSourceFileDiagnostics(); + return std::move(ASTs[0]); } CrossTranslationUnitContext::ASTUnitStorage::ASTUnitStorage( - const CompilerInstance &CI) - : FileAccessor(CI), LoadGuard(const_cast(CI) - .getAnalyzerOpts() - ->CTUImportThreshold) {} + CompilerInstance &CI) + : LoadGuard(CI.getAnalyzerOpts()->CTUImportThreshold) { + + AnalyzerOptionsRef Opts = CI.getAnalyzerOpts(); + if (Opts->CTUOnDemandParsing) + Loader = std::make_unique( + CI, Opts->CTUOnDemandParsingDatabase); + else + Loader = std::make_unique(CI, Opts->CTUDir); +} llvm::Expected CrossTranslationUnitContext::ASTUnitStorage::getASTUnitForFile( @@ -380,8 +492,12 @@ index_error_code::load_threshold_reached); } - // Load the ASTUnit from the pre-dumped AST file specified by ASTFileName. - std::unique_ptr LoadedUnit = FileAccessor(FileName); + auto LoadAttempt = Loader->load(FileName); + + if (!LoadAttempt) + return LoadAttempt.takeError(); + + std::unique_ptr LoadedUnit = std::move(LoadAttempt.get()); // Need the raw pointer and the unique_ptr as well. ASTUnit *Unit = LoadedUnit.get(); @@ -461,7 +577,7 @@ else llvm::sys::path::append(IndexFile, IndexName); - if (auto IndexMapping = parseCrossTUIndex(IndexFile, CrossTUDir)) { + if (auto IndexMapping = parseCrossTUIndex(IndexFile)) { // Initialize member map. NameFileMap = *IndexMapping; return llvm::Error::success(); @@ -471,6 +587,26 @@ }; } +llvm::Error +CrossTranslationUnitContext::ASTOnDemandLoader::lazyInitCompileCommands() { + // Lazily initialize the compilation database. + + if (CompileCommands) + return llvm::Error::success(); + + std::string LoadError; + CompileCommands = tooling::JSONCompilationDatabase::loadFromFile( + OnDemandParsingDatabase, LoadError, + tooling::JSONCommandLineSyntax::AutoDetect); + return CompileCommands ? llvm::Error::success() + : llvm::make_error( + index_error_code::failed_to_get_external_ast); +} + +CrossTranslationUnitContext::ASTOnDemandLoader::ASTOnDemandLoader( + CompilerInstance &CI, StringRef OnDemandParsingDatabase) + : CI(CI), OnDemandParsingDatabase(OnDemandParsingDatabase) {} + llvm::Expected CrossTranslationUnitContext::loadExternalAST( StringRef LookupName, StringRef CrossTUDir, StringRef IndexName, bool DisplayCTUProgress) { diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -510,6 +510,12 @@ Diags->Report(diag::err_analyzer_config_invalid_input) << "ctu-dir" << "a filename"; + if (AnOpts.CTUOnDemandParsing && + !llvm::sys::fs::exists(AnOpts.CTUOnDemandParsingDatabase)) + Diags->Report(diag::err_analyzer_config_invalid_input) + << "ctu-on-demand-parsing-database" + << "a filename"; + if (!AnOpts.ModelPath.empty() && !llvm::sys::fs::is_directory(AnOpts.ModelPath)) Diags->Report(diag::err_analyzer_config_invalid_input) << "model-path" diff --git a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp --- a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp +++ b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp @@ -574,6 +574,11 @@ cross_tu::CrossTranslationUnitContext &CTUCtx = *Engine.getCrossTranslationUnitContext(); + + // Optional OnDemandParsingDatabase; + // if (Opts.CTUOnDemandParsing) + // OnDemandParsingDatabase = Opts.CTUOnDemandParsingDatabase; + llvm::Expected CTUDeclOrError = CTUCtx.getCrossTUDefinition(FD, Opts.CTUDir, Opts.CTUIndexName, Opts.DisplayCTUProgress); diff --git a/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.txt b/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt rename from clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.txt rename to clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt diff --git a/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.on-the-fly.txt b/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.on-the-fly.txt new file mode 100644 --- /dev/null +++ b/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.on-the-fly.txt @@ -0,0 +1,6 @@ +c:@F@inlineAsm ctu-other.c +c:@F@g ctu-other.c +c:@F@f ctu-other.c +c:@F@enumCheck ctu-other.c +c:@F@identImplicit ctu-other.c +c:@F@structInProto ctu-other.c diff --git a/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.txt b/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt rename from clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.txt rename to clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt diff --git a/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.on-the-fly.txt b/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.on-the-fly.txt new file mode 100644 --- /dev/null +++ b/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.on-the-fly.txt @@ -0,0 +1,17 @@ +c:@N@chns@F@chf1#I# ctu-other.cpp +c:@N@myns@N@embed_ns@F@fens#I# ctu-other.cpp +c:@F@g#I# ctu-other.cpp +c:@S@mycls@F@fscl#I#S ctu-other.cpp +c:@S@mycls@F@fcl#I# ctu-other.cpp +c:@S@mycls@F@fvcl#I# ctu-other.cpp +c:@N@myns@S@embed_cls@F@fecl#I# ctu-other.cpp +c:@S@mycls@S@embed_cls2@F@fecl2#I# ctu-other.cpp +c:@S@derived@F@fvcl#I# ctu-other.cpp +c:@F@f#I# ctu-other.cpp +c:@N@myns@F@fns#I# ctu-other.cpp +c:@F@h#I# ctu-other.cpp +c:@F@h_chain#I# ctu-chain.cpp +c:@N@chns@S@chcls@F@chf4#I# ctu-chain.cpp +c:@N@chns@F@chf2#I# ctu-chain.cpp +c:@F@fun_using_anon_struct#I# ctu-other.cpp +c:@F@other_macro_diag#I# ctu-other.cpp diff --git a/clang/test/Analysis/analyzer-config.c b/clang/test/Analysis/analyzer-config.c --- a/clang/test/Analysis/analyzer-config.c +++ b/clang/test/Analysis/analyzer-config.c @@ -33,6 +33,8 @@ // CHECK-NEXT: ctu-dir = "" // CHECK-NEXT: ctu-import-threshold = 100 // CHECK-NEXT: ctu-index-name = externalDefMap.txt +// CHECK-NEXT: ctu-on-demand-parsing = false +// CHECK-NEXT: ctu-on-demand-parsing-database = compile_commands.json // CHECK-NEXT: deadcode.DeadStores:ShowFixIts = false // CHECK-NEXT: deadcode.DeadStores:WarnForDeadNestedAssignments = true // CHECK-NEXT: debug.AnalysisOrder:* = false @@ -100,4 +102,4 @@ // CHECK-NEXT: unroll-loops = false // CHECK-NEXT: widen-loops = false // CHECK-NEXT: [stats] -// CHECK-NEXT: num-entries = 97 +// CHECK-NEXT: num-entries = 99 diff --git a/clang/test/Analysis/ctu-different-triples.cpp b/clang/test/Analysis/ctu-different-triples.cpp --- a/clang/test/Analysis/ctu-different-triples.cpp +++ b/clang/test/Analysis/ctu-different-triples.cpp @@ -2,7 +2,7 @@ // RUN: mkdir -p %t/ctudir // RUN: %clang_cc1 -std=c++14 -triple x86_64-pc-linux-gnu \ // RUN: -emit-pch -o %t/ctudir/ctu-other.cpp.ast %S/Inputs/ctu-other.cpp -// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.txt %t/ctudir/externalDefMap.txt +// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt %t/ctudir/externalDefMap.txt // RUN: %clang_analyze_cc1 -std=c++14 -triple powerpc64-montavista-linux-gnu \ // RUN: -analyzer-checker=core,debug.ExprInspection \ // RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ diff --git a/clang/test/Analysis/ctu-main.c b/clang/test/Analysis/ctu-main.c --- a/clang/test/Analysis/ctu-main.c +++ b/clang/test/Analysis/ctu-main.c @@ -2,7 +2,7 @@ // RUN: mkdir -p %t/ctudir2 // RUN: %clang_cc1 -triple x86_64-pc-linux-gnu \ // RUN: -emit-pch -o %t/ctudir2/ctu-other.c.ast %S/Inputs/ctu-other.c -// RUN: cp %S/Inputs/ctu-other.c.externalDefMap.txt %t/ctudir2/externalDefMap.txt +// RUN: cp %S/Inputs/ctu-other.c.externalDefMap.ast-dump.txt %t/ctudir2/externalDefMap.txt // RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fsyntax-only -std=c89 -analyze \ // RUN: -analyzer-checker=core,debug.ExprInspection \ // RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ @@ -50,6 +50,10 @@ void testImplicit() { int res = identImplicit(6); // external implicit functions are not inlined clang_analyzer_eval(res == 6); // expected-warning{{TRUE}} + // Call something with uninitialized from the same function in which the implicit was called. + // This is necessary to reproduce a special bug in NoStoreFuncVisitor. + int uninitialized; + h(uninitialized); // expected-warning{{1st function call argument is an uninitialized value}} } // Tests the import of functions that have a struct parameter diff --git a/clang/test/Analysis/ctu-main.cpp b/clang/test/Analysis/ctu-main.cpp --- a/clang/test/Analysis/ctu-main.cpp +++ b/clang/test/Analysis/ctu-main.cpp @@ -4,7 +4,7 @@ // RUN: -emit-pch -o %t/ctudir/ctu-other.cpp.ast %S/Inputs/ctu-other.cpp // RUN: %clang_cc1 -std=c++14 -triple x86_64-pc-linux-gnu \ // RUN: -emit-pch -o %t/ctudir/ctu-chain.cpp.ast %S/Inputs/ctu-chain.cpp -// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.txt %t/ctudir/externalDefMap.txt +// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt %t/ctudir/externalDefMap.txt // RUN: %clang_analyze_cc1 -std=c++14 -triple x86_64-pc-linux-gnu \ // RUN: -analyzer-checker=core,debug.ExprInspection \ // RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ diff --git a/clang/test/Analysis/ctu-main.c b/clang/test/Analysis/ctu-on-demand-parsing.c copy from clang/test/Analysis/ctu-main.c copy to clang/test/Analysis/ctu-on-demand-parsing.c --- a/clang/test/Analysis/ctu-main.c +++ b/clang/test/Analysis/ctu-on-demand-parsing.c @@ -1,12 +1,14 @@ // RUN: rm -rf %t && mkdir %t -// RUN: mkdir -p %t/ctudir2 -// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu \ -// RUN: -emit-pch -o %t/ctudir2/ctu-other.c.ast %S/Inputs/ctu-other.c -// RUN: cp %S/Inputs/ctu-other.c.externalDefMap.txt %t/ctudir2/externalDefMap.txt +// RUN: mkdir -p %t/ctudir +// RUN: echo '[{"directory":"%t/ctudir","command":"gcc -c ctu-other.c","file":"ctu-other.c"}]' | sed -e 's/\\/\\\\/g' > %t/ctudir/compile_commands.json +// RUN: cp %S/Inputs/ctu-other.c %t/ctudir/ctu-other.c +// RUN: %clang_extdef_map %t/ctudir/ctu-other.c > %t/ctudir/externalDefMap.txt // RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fsyntax-only -std=c89 -analyze \ // RUN: -analyzer-checker=core,debug.ExprInspection \ // RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ -// RUN: -analyzer-config ctu-dir=%t/ctudir2 \ +// RUN: -analyzer-config ctu-dir=%t/ctudir \ +// RUN: -analyzer-config ctu-on-demand-parsing=true \ +// RUN: -analyzer-config ctu-on-demand-parsing-database="%t/ctudir/compile_commands.json" \ // RUN: -verify %s void clang_analyzer_eval(int); @@ -19,7 +21,7 @@ extern FooBar fb; int f(int); void testGlobalVariable() { - clang_analyzer_eval(f(5) == 1); // expected-warning{{TRUE}} + clang_analyzer_eval(f(5) == 1); // expected-warning{{TRUE}} } // Test enums. @@ -45,11 +47,18 @@ g(0); // expected-warning@Inputs/ctu-other.c:29 {{Access to field 'a' results in a dereference of a null pointer (loaded from variable 'ctx')}} } +void h(int); + // The external function prototype is incomplete. // warning:implicit functions are prohibited by c99 void testImplicit() { - int res = identImplicit(6); // external implicit functions are not inlined + int res = identImplicit(6); clang_analyzer_eval(res == 6); // expected-warning{{TRUE}} + + // Call something with uninitialized from the same function in which the implicit was called. + // This is necessary to reproduce a special bug in NoStoreFuncVisitor. + int uninitialized; + h(uninitialized); // expected-warning{{1st function call argument is an uninitialized value}} } // Tests the import of functions that have a struct parameter diff --git a/clang/test/Analysis/ctu-on-demand-parsing.cpp b/clang/test/Analysis/ctu-on-demand-parsing.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Analysis/ctu-on-demand-parsing.cpp @@ -0,0 +1,100 @@ +// RUN: rm -rf %t && mkdir %t +// RUN: mkdir -p %t/ctudir +// RUN: cp %S/Inputs/ctu-chain.cpp %t/ctudir/ctu-chain.cpp +// RUN: echo '[{"directory":"%S/Inputs","command":"clang++ -c ctu-chain.cpp","file":"ctu-chain.cpp"},{"directory":"%S/Inputs","command":"clang++ -c ctu-other.cpp","file":"ctu-other.cpp"}]' | sed -e 's/\\/\\\\/g' > %t/ctudir/compile_commands.json +// RUN: %clang_extdef_map %S/Inputs/ctu-chain.cpp %S/Inputs/ctu-other.cpp > %t/ctudir/externalDefMap.txt +// RUN: %clang_analyze_cc1 -triple x86_64-pc-linux-gnu \ +// RUN: -analyzer-checker=core,debug.ExprInspection \ +// RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ +// RUN: -analyzer-config ctu-dir="%t/ctudir" \ +// RUN: -analyzer-config ctu-on-demand-parsing=true \ +// RUN: -analyzer-config ctu-on-demand-parsing-database="%t/ctudir/compile_commands.json" \ +// RUN: -verify %s +// RUN: %clang_analyze_cc1 -triple x86_64-pc-linux-gnu \ +// RUN: -analyzer-checker=core,debug.ExprInspection \ +// RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ +// RUN: -analyzer-config ctu-dir="%t/ctudir" \ +// RUN: -analyzer-config ctu-on-demand-parsing=true \ +// RUN: -analyzer-config ctu-on-demand-parsing-database="%t/ctudir/compile_commands.json" \ +// RUN: -analyzer-config display-ctu-progress=true 2>&1 %s | FileCheck %s + +// CHECK: CTU loaded AST file: {{.*}}ctu-other.cpp +// CHECK: CTU loaded AST file: {{.*}}ctu-chain.cpp + +#include "ctu-hdr.h" + +void clang_analyzer_eval(int); + +int f(int); +int g(int); +int h(int); + +int callback_to_main(int x) { return x + 1; } + +namespace myns { +int fns(int x); + +namespace embed_ns { +int fens(int x); +} + +class embed_cls { +public: + int fecl(int x); +}; +} // namespace myns + +class mycls { +public: + int fcl(int x); + virtual int fvcl(int x); + static int fscl(int x); + + class embed_cls2 { + public: + int fecl2(int x); + }; +}; + +class derived : public mycls { +public: + virtual int fvcl(int x) override; +}; + +namespace chns { +int chf1(int x); +} + +int fun_using_anon_struct(int); +int other_macro_diag(int); + +void test_virtual_functions(mycls *obj) { + // The dynamic type is known. + clang_analyzer_eval(mycls().fvcl(1) == 8); // expected-warning{{TRUE}} + clang_analyzer_eval(derived().fvcl(1) == 9); // expected-warning{{TRUE}} + // We cannot decide about the dynamic type. + clang_analyzer_eval(obj->fvcl(1) == 8); // expected-warning{{FALSE}} expected-warning{{TRUE}} + clang_analyzer_eval(obj->fvcl(1) == 9); // expected-warning{{FALSE}} expected-warning{{TRUE}} +} + +int main() { + clang_analyzer_eval(f(3) == 2); // expected-warning{{TRUE}} + clang_analyzer_eval(f(4) == 3); // expected-warning{{TRUE}} + clang_analyzer_eval(f(5) == 3); // expected-warning{{FALSE}} + clang_analyzer_eval(g(4) == 6); // expected-warning{{TRUE}} + clang_analyzer_eval(h(2) == 8); // expected-warning{{TRUE}} + + clang_analyzer_eval(myns::fns(2) == 9); // expected-warning{{TRUE}} + clang_analyzer_eval(myns::embed_ns::fens(2) == -1); // expected-warning{{TRUE}} + clang_analyzer_eval(mycls().fcl(1) == 6); // expected-warning{{TRUE}} + clang_analyzer_eval(mycls::fscl(1) == 7); // expected-warning{{TRUE}} + clang_analyzer_eval(myns::embed_cls().fecl(1) == -6); // expected-warning{{TRUE}} + clang_analyzer_eval(mycls::embed_cls2().fecl2(0) == -11); // expected-warning{{TRUE}} + + clang_analyzer_eval(chns::chf1(4) == 12); // expected-warning{{TRUE}} + clang_analyzer_eval(fun_using_anon_struct(8) == 8); // expected-warning{{TRUE}} + + clang_analyzer_eval(other_macro_diag(1) == 1); // expected-warning{{TRUE}} + // expected-warning@Inputs/ctu-other.cpp:93{{REACHABLE}} + MACRODIAG(); // expected-warning{{REACHABLE}} +} diff --git a/clang/test/Analysis/ctu-unknown-parts-in-triples.cpp b/clang/test/Analysis/ctu-unknown-parts-in-triples.cpp --- a/clang/test/Analysis/ctu-unknown-parts-in-triples.cpp +++ b/clang/test/Analysis/ctu-unknown-parts-in-triples.cpp @@ -5,7 +5,7 @@ // RUN: mkdir -p %t/ctudir // RUN: %clang_cc1 -std=c++14 -triple x86_64-pc-linux-gnu \ // RUN: -emit-pch -o %t/ctudir/ctu-other.cpp.ast %S/Inputs/ctu-other.cpp -// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.txt %t/ctudir/externalDefMap.txt +// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt %t/ctudir/externalDefMap.txt // RUN: %clang_analyze_cc1 -std=c++14 -triple x86_64-unknown-linux-gnu \ // RUN: -analyzer-checker=core,debug.ExprInspection \ // RUN: -analyzer-config experimental-enable-naive-ctu-analysis=true \ diff --git a/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp b/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp --- a/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp +++ b/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp @@ -7,10 +7,11 @@ //===----------------------------------------------------------------------===// #include "clang/CrossTU/CrossTranslationUnit.h" -#include "clang/Frontend/CompilerInstance.h" #include "clang/AST/ASTConsumer.h" +#include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Tooling/Tooling.h" +#include "llvm/ADT/Optional.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/ToolOutputFile.h" @@ -162,7 +163,7 @@ IndexFile.os().flush(); EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName)); llvm::Expected> IndexOrErr = - parseCrossTUIndex(IndexFileName, ""); + parseCrossTUIndex(IndexFileName); EXPECT_TRUE((bool)IndexOrErr); llvm::StringMap ParsedIndex = IndexOrErr.get(); for (const auto &E : Index) { @@ -173,25 +174,5 @@ EXPECT_TRUE(Index.count(E.getKey())); } -TEST(CrossTranslationUnit, CTUDirIsHandledCorrectly) { - llvm::StringMap Index; - Index["a"] = "/b/c/d"; - std::string IndexText = createCrossTUIndexString(Index); - - int IndexFD; - llvm::SmallString<256> IndexFileName; - ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD, - IndexFileName)); - llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD); - IndexFile.os() << IndexText; - IndexFile.os().flush(); - EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName)); - llvm::Expected> IndexOrErr = - parseCrossTUIndex(IndexFileName, "/ctudir"); - EXPECT_TRUE((bool)IndexOrErr); - llvm::StringMap ParsedIndex = IndexOrErr.get(); - EXPECT_EQ(ParsedIndex["a"], "/ctudir/b/c/d"); -} - } // end namespace cross_tu } // end namespace clang