[PATCH] D54104: [Tooling] Correct the total number of files being processed when `filter` is provided.

[Haojian Wu via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL346135: [Tooling] Correct the total number of files being 
processed when `filter` is… (authored by hokein, committed by ).
Herald added a subscriber: llvm-commits.

Repository:
  rL LLVM

https://reviews.llvm.org/D54104

Files:
  cfe/trunk/lib/Tooling/AllTUsExecution.cpp


Index: cfe/trunk/lib/Tooling/AllTUsExecution.cpp
===
--- cfe/trunk/lib/Tooling/AllTUsExecution.cpp
+++ cfe/trunk/lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,12 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (RegexFilter.match(File))
+  Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -116,10 +121,7 @@
   llvm::errs() << "Error while getting current working directory: "
<< EC.message() << "\n";
 }
-llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +


Index: cfe/trunk/lib/Tooling/AllTUsExecution.cpp
===
--- cfe/trunk/lib/Tooling/AllTUsExecution.cpp
+++ cfe/trunk/lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,12 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (RegexFilter.match(File))
+  Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -116,10 +121,7 @@
   llvm::errs() << "Error while getting current working directory: "
<< EC.message() << "\n";
 }
-llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D54104: [Tooling] Correct the total number of files being processed when `filter` is provided.

[Haojian Wu via Phabricator via cfe-commits]

hokein updated this revision to Diff 172585.
hokein marked 2 inline comments as done.
hokein added a comment.

Address comments.


Repository:
  rC Clang

https://reviews.llvm.org/D54104

Files:
  lib/Tooling/AllTUsExecution.cpp


Index: lib/Tooling/AllTUsExecution.cpp
===
--- lib/Tooling/AllTUsExecution.cpp
+++ lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,12 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (RegexFilter.match(File))
+  Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -116,10 +121,7 @@
   llvm::errs() << "Error while getting current working directory: "
<< EC.message() << "\n";
 }
-llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +


Index: lib/Tooling/AllTUsExecution.cpp
===
--- lib/Tooling/AllTUsExecution.cpp
+++ lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,12 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (RegexFilter.match(File))
+  Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -116,10 +121,7 @@
   llvm::errs() << "Error while getting current working directory: "
<< EC.message() << "\n";
 }
-llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D54104: [Tooling] Correct the total number of files being processed when `filter` is provided.

[Eric Liu via Phabricator via cfe-commits]

ioeric accepted this revision.
ioeric added inline comments.
This revision is now accepted and ready to land.



Comment at: lib/Tooling/AllTUsExecution.cpp:103
+if (!RegexFilter.match(File))
+  continue;
+Files.push_back(File);

nit: `if (match) then push_back` would be a line shorter.



Comment at: lib/Tooling/AllTUsExecution.cpp:125
 }
 llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {

This is unused now


Repository:
  rC Clang

https://reviews.llvm.org/D54104



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D54104: [Tooling] Correct the total number of files being processed when `filter` is provided.

[Haojian Wu via Phabricator via cfe-commits]

hokein created this revision.
hokein added a reviewer: ioeric.

Repository:
  rC Clang

https://reviews.llvm.org/D54104

Files:
  lib/Tooling/AllTUsExecution.cpp


Index: lib/Tooling/AllTUsExecution.cpp
===
--- lib/Tooling/AllTUsExecution.cpp
+++ lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,13 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (!RegexFilter.match(File))
+  continue;
+Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -118,8 +124,6 @@
 }
 llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +


Index: lib/Tooling/AllTUsExecution.cpp
===
--- lib/Tooling/AllTUsExecution.cpp
+++ lib/Tooling/AllTUsExecution.cpp
@@ -96,7 +96,13 @@
 llvm::errs() << Msg.str() << "\n";
   };
 
-  auto Files = Compilations.getAllFiles();
+  std::vector Files;
+  llvm::Regex RegexFilter(Filter);
+  for (const auto& File : Compilations.getAllFiles()) {
+if (!RegexFilter.match(File))
+  continue;
+Files.push_back(File);
+  }
   // Add a counter to track the progress.
   const std::string TotalNumStr = std::to_string(Files.size());
   unsigned Counter = 0;
@@ -118,8 +124,6 @@
 }
 llvm::Regex RegexFilter(Filter);
 for (std::string File : Files) {
-  if (!RegexFilter.match(File))
-continue;
   Pool.async(
   [&](std::string Path) {
 Log("[" + std::to_string(Count()) + "/" + TotalNumStr +
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits