From 2049390441846fd33d43684a4a89dca157c33a17 Mon Sep 17 00:00:00 2001
From: Anton Bikineev <bikineev@chromium.org>
Date: Wed, 23 Feb 2022 11:35:12 +0100
Subject: [PATCH] cppgc: young-gen: Fix gcc and Bazel builds

Use class instead of lambda for static constexpr comparator (looks like
a bug in gcc).

Bug: chromium:1029379
Change-Id: I5caebacba2550bb206514f6e989d44361995f368
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3484315
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79228}
---
 BUILD.bazel                     |  4 ++--
 src/heap/cppgc/remembered-set.h | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index aa349e237b..3c8c895310 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2903,8 +2903,8 @@ filegroup(
         "src/heap/cppgc/process-heap-statistics.h",
         "src/heap/cppgc/raw-heap.cc",
         "src/heap/cppgc/raw-heap.h",
-        "src/heap/cppgc/remembered-set.cc"
-        "src/heap/cppgc/remembered-set.h"
+        "src/heap/cppgc/remembered-set.cc",
+        "src/heap/cppgc/remembered-set.h",
         "src/heap/cppgc/source-location.cc",
         "src/heap/cppgc/stats-collector.cc",
         "src/heap/cppgc/stats-collector.h",
diff --git a/src/heap/cppgc/remembered-set.h b/src/heap/cppgc/remembered-set.h
index 2024fa1fae..eb8de6da8e 100644
--- a/src/heap/cppgc/remembered-set.h
+++ b/src/heap/cppgc/remembered-set.h
@@ -48,10 +48,12 @@ class V8_EXPORT_PRIVATE OldToNewRememberedSet final {
  private:
   friend class MinorGCTest;
 
-  static constexpr auto compare_parameter = [](const WeakCallbackItem& lhs,
-                                               const WeakCallbackItem& rhs) {
-    return lhs.parameter < rhs.parameter;
-  };
+  static constexpr struct {
+    bool operator()(const WeakCallbackItem& lhs,
+                    const WeakCallbackItem& rhs) const {
+      return lhs.parameter < rhs.parameter;
+    }
+  } compare_parameter{};
 
   const HeapBase& heap_;
   std::set<void*> remembered_slots_;