dwyu: Make sure includes in toplevel libraries are correctly recognized.

hzeller · Aug 31, 2024 · a054c04 · a054c04
1 parent 80d5ee5
commit a054c04
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/bant/tool/dwyu.cc b/bant/tool/dwyu.cc
@@ -70,7 +70,8 @@ bool IsHeaderInList(std::string_view header,
   // so we always need to prepend that prefix_path.
   for (const std::string_view list_item : list) {
     if (header.ends_with(list_item) &&  // cheap first test before strcat
-        absl::StrCat(prefix_path, "/", list_item) == header) {
+        (header == list_item ||
+         absl::StrCat(prefix_path, "/", list_item) == header)) {
       return true;
     }
   }

diff --git a/bant/tool/dwyu_test.cc b/bant/tool/dwyu_test.cc
@@ -234,6 +234,26 @@ cc_library(
   }
 }
 
+TEST(DWYUTest, ToplevelIncludesWithoutPrefixSlashWork) {
+  ParsedProjectTestUtil pp;
+  pp.Add("//", R"(
+cc_library(
+  name = "foo",
+  srcs = ["foo.cc"],
+  hdrs = ["foo.h"]
+)
+)");
+
+  {
+    DWYUTestFixture tester(pp.project());
+    tester.AddSource("foo.h", "");
+    tester.AddSource("foo.cc", R"(
+#include "foo.h"
+)");
+    tester.RunForTarget("//:foo");
+  }
+}
+
 TEST(DWYUTest, ChooseMinimalDependencySetIfMultipleLibrariesProvideHeader) {
   ParsedProjectTestUtil pp;
   pp.Add("//path", R"(