Implement with new glob defintion.

Created using spr 1.3.6

Author: qinkunbao

clang/lib/Basic/Diagnostic.cpp

@@ -554,9 +554,11 @@ void WarningsSpecialCaseList::processSections(DiagnosticsEngine &Diags) {
     // line.
     const auto &DiagSectionMatcher = Entry.SectionMatcher;
     unsigned DiagLine = 0;
-    for (const auto &[Pattern, Pair] : DiagSectionMatcher->Globs)
-      if (Pattern == DiagName)
-        DiagLine = Pair.second;
+    for (const auto &Glob : DiagSectionMatcher->Globs)
+      if (Glob->Name == DiagName) {
+        DiagLine = Glob->LineNo;
+        break;
+      }
     LineAndSectionEntry.emplace_back(DiagLine, &Entry);
   }
   llvm::sort(LineAndSectionEntry);
@@ -628,12 +630,12 @@ bool WarningsSpecialCaseList::globsMatches(
     StringRef Category = Entry.getKey();
     const llvm::SpecialCaseList::Matcher &Matcher = Entry.getValue();
     bool IsPositive = Category != "emit";
-    for (const auto &[Pattern, Glob] : Matcher.Globs) {
-      if (Pattern.size() < LongestMatch.size())
+    for (const auto &Glob : Matcher.Globs) {
+      if (Glob->Name.size() < LongestMatch.size())
         continue;
-      if (!Glob.first.match(FilePath))
+      if (!Glob->Pattern.match(FilePath))
         continue;
-      LongestMatch = Pattern;
+      LongestMatch = Glob->Name;
       LongestIsPositive = IsPositive;
     }
   }

llvm/include/llvm/Support/SpecialCaseList.h

@@ -125,7 +125,14 @@ class SpecialCaseList {
     // Returns zero if no match is found.
     LLVM_ABI unsigned match(StringRef Query) const;
 
-    std::vector<std::pair<std::string, std::pair<GlobPattern, unsigned>>> Globs;
+    struct Glob {
+      std::string Name;
+      unsigned LineNo;
+      GlobPattern Pattern;
+      Glob(Glob &&) = delete;
+    };
+
+    std::vector<std::unique_ptr<Matcher::Glob>> Globs;
     std::vector<std::pair<std::unique_ptr<Regex>, unsigned>> RegExes;
   };
 

llvm/lib/Support/GlobPattern.cpp

@@ -139,7 +139,6 @@ GlobPattern::create(StringRef S, std::optional<size_t> MaxSubPatterns) {
   // Store the prefix that does not contain any metacharacter.
   size_t PrefixSize = S.find_first_of("?*[{\\");
   Pat.Prefix = S.substr(0, PrefixSize);
-  llvm::errs() << "GlobPattern::create:  Prefix: " << Pat.Prefix << "\n";
   if (PrefixSize == std::string::npos)
     return Pat;
   S = S.substr(PrefixSize);
@@ -192,17 +191,8 @@ GlobPattern::SubGlobPattern::create(StringRef S) {
 }
 
 bool GlobPattern::match(StringRef S) const {
-  int debug = 0;
-  if (S == "hello") {
-    llvm::errs() << "Prefix: " << Prefix << "\n";
-    debug = 1;
-  }
-  if (!S.consume_front(Prefix)) {
-    if (debug == 1) {
-      llvm::errs() << "consume_front: " << Prefix << "\n";
-    }
+  if (!S.consume_front(Prefix))
     return false;
-  }
   if (SubGlobs.empty() && S.empty())
     return true;
   for (auto &Glob : SubGlobs)

llvm/lib/Support/SpecialCaseList.cpp

@@ -53,26 +53,22 @@ Error SpecialCaseList::Matcher::insert(StringRef Pattern, unsigned LineNumber,
     return Error::success();
   }
 
-  Globs.emplace_back();
-  auto &Glob = Globs.back();
-  Glob.first = Pattern.str();
-  auto &Pair = Glob.second;
+  std::unique_ptr<Matcher::Glob> Glob = std::make_unique<Matcher::Glob>();
+  Glob->Name = Pattern.str();
+  Glob->LineNo = LineNumber;
   // We must be sure to use the string in the map rather than the provided
   // reference which could be destroyed before match() is called
-  llvm::errs() << __func__ << " GlobPattern::create: " << Glob.first << "\n";
-  if (auto Err = GlobPattern::create(Glob.first, /*MaxSubPatterns=*/1024)
-                     .moveInto(Pair.first))
+  if (auto Err = GlobPattern::create(Glob->Name, /*MaxSubPatterns=*/1024)
+                     .moveInto(Glob->Pattern))
     return Err;
-  Pair.second = LineNumber;
+  Globs.push_back(std::move(Glob));
   return Error::success();
 }
 
 unsigned SpecialCaseList::Matcher::match(StringRef Query) const {
-  for (const auto &[Pattern, Pair] : Globs) {
-    llvm::outs() << "Inside match: " << Pattern
-                 << " Line number: " << Pair.second << "\n";
-    if (Pair.first.match(Query))
-      return Pair.second;
+  for (const auto &Glob : Globs) {
+    if (Glob->Pattern.match(Query))
+      return Glob->LineNo;
   }
   for (const auto &[Regex, LineNumber] : RegExes)
     if (Regex->match(Query))

llvm/unittests/Support/SpecialCaseListTest.cpp

@@ -63,20 +63,20 @@ TEST_F(SpecialCaseListTest, Basic) {
                           "src:hi=category\n"
                           "src:z*=category\n");
   EXPECT_TRUE(SCL->inSection("", "src", "hello"));
-  // EXPECT_TRUE(SCL->inSection("", "src", "bye"));
-  // EXPECT_TRUE(SCL->inSection("", "src", "hi", "category"));
-  // EXPECT_TRUE(SCL->inSection("", "src", "zzzz", "category"));
-  // EXPECT_FALSE(SCL->inSection("", "src", "hi"));
-  // EXPECT_FALSE(SCL->inSection("", "fun", "hello"));
-  // EXPECT_FALSE(SCL->inSection("", "src", "hello", "category"));
-
-  // EXPECT_EQ(3u, SCL->inSectionBlame("", "src", "hello"));
-  // EXPECT_EQ(4u, SCL->inSectionBlame("", "src", "bye"));
-  // EXPECT_EQ(5u, SCL->inSectionBlame("", "src", "hi", "category"));
-  // EXPECT_EQ(6u, SCL->inSectionBlame("", "src", "zzzz", "category"));
-  // EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hi"));
-  // EXPECT_EQ(0u, SCL->inSectionBlame("", "fun", "hello"));
-  // EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hello", "category"));
+  EXPECT_TRUE(SCL->inSection("", "src", "bye"));
+  EXPECT_TRUE(SCL->inSection("", "src", "hi", "category"));
+  EXPECT_TRUE(SCL->inSection("", "src", "zzzz", "category"));
+  EXPECT_FALSE(SCL->inSection("", "src", "hi"));
+  EXPECT_FALSE(SCL->inSection("", "fun", "hello"));
+  EXPECT_FALSE(SCL->inSection("", "src", "hello", "category"));
+
+  EXPECT_EQ(3u, SCL->inSectionBlame("", "src", "hello"));
+  EXPECT_EQ(4u, SCL->inSectionBlame("", "src", "bye"));
+  EXPECT_EQ(5u, SCL->inSectionBlame("", "src", "hi", "category"));
+  EXPECT_EQ(6u, SCL->inSectionBlame("", "src", "zzzz", "category"));
+  EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hi"));
+  EXPECT_EQ(0u, SCL->inSectionBlame("", "fun", "hello"));
+  EXPECT_EQ(0u, SCL->inSectionBlame("", "src", "hello", "category"));
 }
 
 TEST_F(SpecialCaseListTest, CorrectErrorLineNumberWithBlankLine) {