From 706b4fc47bbc608932d3b491ae19a3b9cde9497b Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Fri, 17 Jan 2020 20:45:01 +0000 Subject: Vendor import of llvm-project master e26a78e70, the last commit before the llvmorg-11-init tag, from which release/10.x was branched. --- clang/lib/Tooling/Inclusions/HeaderIncludes.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'clang/lib/Tooling/Inclusions/HeaderIncludes.cpp') diff --git a/clang/lib/Tooling/Inclusions/HeaderIncludes.cpp b/clang/lib/Tooling/Inclusions/HeaderIncludes.cpp index e746bbb7f87b..37a0816c803e 100644 --- a/clang/lib/Tooling/Inclusions/HeaderIncludes.cpp +++ b/clang/lib/Tooling/Inclusions/HeaderIncludes.cpp @@ -184,6 +184,10 @@ IncludeCategoryManager::IncludeCategoryManager(const IncludeStyle &Style, FileName.endswith(".cpp") || FileName.endswith(".c++") || FileName.endswith(".cxx") || FileName.endswith(".m") || FileName.endswith(".mm"); + if (!Style.IncludeIsMainSourceRegex.empty()) { + llvm::Regex MainFileRegex(Style.IncludeIsMainSourceRegex); + IsMainFile |= MainFileRegex.match(FileName); + } } int IncludeCategoryManager::getIncludePriority(StringRef IncludeName, @@ -364,6 +368,5 @@ tooling::Replacements HeaderIncludes::remove(llvm::StringRef IncludeName, return Result; } - } // namespace tooling } // namespace clang -- cgit v1.2.3