[all-commits] [llvm/llvm-project] 8d15f9: [Benchmark] Fix warnings around usage of __COUNTER...

[Aiden Grossman via All-commits]

  Branch: refs/heads/release/22.x
  Home:   https://github.com/llvm/llvm-project
  Commit: 8d15f98a03ce2ea6208536ec5fd1c43a48ec5bef
      https://github.com/llvm/llvm-project/commit/8d15f98a03ce2ea6208536ec5fd1c43a48ec5bef
  Author: Aiden Grossman <aidengrossman at google.com>
  Date:   2026-03-05 (Thu, 05 Mar 2026)

  Changed paths:
    M third-party/benchmark/include/benchmark/benchmark.h

  Log Message:
  -----------
  [Benchmark] Fix warnings around usage of __COUNTER__ (#184524)

Premerge CI is currently failing with the following after the update to
clang v22:

```
/home/gha/llvm-project/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp:92:1: error: '__COUNTER__' is a C2y extension [-Werror,-Wc2y-extensions]
   92 | BENCHMARK(dexQueries);
      | ^
```

Some original work was done around this in
df1d786c460e0e47c9074f3533f098190ebfbc1b, which was then done in
upstream Google benchmark in

https://github.com/google/benchmark/commit/d8db2f90b643eb28a12976beb4d57bcfb639911d.
The original work done in the patch implementing this feature doesn't
seem to account for as many cases as the upstream patch does. This patch
reverts the diff in df1d786c460e0e47c9074f3533f098190ebfbc1b and applies
the applicable hunks from the upstream patch.

(cherry picked from commit 7fb92cdf5fa69423b4b99259057eb8de813c1344)



To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications