Simplified filterSymbolTags:

ratzdi · ratzdi · commit 86a41ca30a04 · 2026-04-27T11:17:39.000+02:00
- Reused a combined mask (`RemoveVirtualAndOverrides`) to avoid repeating `~(Overrides | Virtual)`.
- Merged the two identical "remove virtual" cases (`Overrides`, `Abstract`) into one condition.
diff --git a/clang-tools-extra/clangd/FindSymbols.cpp b/clang-tools-extra/clangd/FindSymbols.cpp
@@ -203,23 +203,20 @@ SymbolTags filterSymbolTags(SymbolTags ST) {
   const SymbolTags AbstractMask = SymbolTags::fromTag(SymbolTag::Abstract);
   const SymbolTags FinalMask = SymbolTags::fromTag(SymbolTag::Final);
 
-  // Implements implies Overrides + Virtual.
+  const SymbolTags RemoveVirtualAndOverrides = VirtualMask | OverridesMask;
+
+  // Implements implies both Overrides and Virtual.
   if (ST & ImplementsMask)
-    ST &= ~(OverridesMask | VirtualMask);
+    ST &= ~RemoveVirtualAndOverrides;
 
-  // Overrides implies Virtual.
-  if (ST & OverridesMask)
-    ST &= ~VirtualMask;
+  // Final also suppresses both Virtual and Overrides in this model.
+  if (ST & FinalMask)
+    ST &= ~RemoveVirtualAndOverrides;
 
-  // Abstract implies Virtual.
-  if (ST & AbstractMask)
+  // Overrides or Abstract each imply Virtual.
+  if (ST & (OverridesMask | AbstractMask))
     ST &= ~VirtualMask;
 
-  // Final implies Virtual; Overrides is also redundant as Final overrides are
-  // still overrides.
-  if (ST & FinalMask)
-    ST &= ~(VirtualMask | OverridesMask);
-
   return ST;
 }
 
