Merge pull request ceph#61890 from zhscn/fix-clang-19

crimson: fix compile errors in clang 19

Reviewed-by: Matan Breizman <[email protected]>

Author: Matan-B

src/crimson/common/interruptible_future.h

@@ -1179,7 +1179,7 @@ struct interruptor
       std::move(ic),
       std::forward<OpFunc>(opfunc),
       std::forward<Params>(params)...
-    ).template handle_interruption(std::move(efunc));
+    ).handle_interruption(std::move(efunc));
   }
 
   template <typename OpFunc, typename OnInterrupt,

src/crimson/common/operation.h

@@ -309,7 +309,7 @@ struct AggregateBlockingEvent {
 
     class TriggerContainer final : public TriggerI::TriggerContainerI {
       AggregateBlockingEvent& event;
-      typename decltype(event.events)::iterator iter;
+      typename std::list<T>::iterator iter;
       typename T::template Trigger<OpT> trigger;
 
       typename T::TriggerI &get_trigger() final {

src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h

@@ -1153,7 +1153,7 @@ struct staged {
       return insert_size(key, value);
     } else {
       assert(stage < STAGE);
-      return NXT_STAGE_T::template insert_size_at(stage, key, value);
+      return NXT_STAGE_T::insert_size_at(stage, key, value);
     }
   }
 
@@ -1406,7 +1406,7 @@ struct staged {
         return container_t::insert_at(
             mut, container, key, value, 0, _insert_size, p_left_bound);
       } else {
-        auto range = container_t::template insert_prefix_at(
+        auto range = container_t::insert_prefix_at(
             mut, container, key, 0, _insert_size, p_left_bound);
         return NXT_STAGE_T::template insert_new<KT>(mut, range, key, value);
       }

src/crimson/osd/ops_executer.cc

@@ -32,6 +32,15 @@ namespace {
 
 namespace crimson::osd {
 
+// workaround for clang 19
+// when a .cc file includes ops_executer.h but doesn't include the pg.h,
+// it seems that clang++-19 can't retrieve the type hierarchy of PG, so
+// that the destructor of boost::intrusive_ptr<PG> could not find the hidden
+// friend of intrusive_ptr_release.
+// Moving the destructor invocation of intrusive_ptr to this file could
+// solve this issue.
+OpsExecuter::~OpsExecuter() {}
+
 OpsExecuter::call_ierrorator::future<> OpsExecuter::do_op_call(OSDOp& osd_op)
 {
   std::string cname, mname;

src/crimson/osd/ops_executer.h

@@ -383,6 +383,8 @@ class OpsExecuter {
         snapc) {
   }
 
+  ~OpsExecuter();
+
   template <class Func>
   struct RollbackHelper;
 

src/crimson/osd/osd_operations/replicated_request.cc

@@ -93,7 +93,7 @@ RepRequest::interruptible_future<> RepRequest::with_pg_interruptible(
   auto [commit_fut, reply] = co_await pg->handle_rep_op(req);
 
   // Transitions from OrderedExclusive->OrderedConcurrent cannot block
-  this->template enter_stage_sync(repop_pipeline(*pg).wait_commit);
+  this->enter_stage_sync(repop_pipeline(*pg).wait_commit);
 
   co_await std::move(commit_fut);
 

src/crimson/osd/pg_shard_manager.cc

@@ -26,7 +26,7 @@ seastar::future<> PGShardManager::load_pgs(crimson::os::FuturizedStore& store)
           return get_pg_to_shard_mapping().get_or_create_pg_mapping(
             pgid, shard_core
           ).then([this, pgid] (auto core) {
-            return this->template with_remote_shard_state(
+            return this->with_remote_shard_state(
               core,
               [pgid](
 	      PerShardState &per_shard_state,

src/crimson/tools/perf_crimson_msgr.cc

@@ -369,7 +369,7 @@ static seastar::future<> run(
                   return seastar::smp::invoke_on_all([&report, this] {
                     auto &server = container().local();
                     server.get_report(report.reports[seastar::this_shard_id()]);
-                  }).then([&report, this] {
+                  }).then([&report] {
                     auto now = mono_clock::now();
                     auto prv = report.start_time;
                     report.start_time = now;
@@ -417,7 +417,7 @@ static seastar::future<> run(
               });
             }
           );
-        }).then([this] {
+        }).then([] {
           logger().info("report is stopped!");
         }).forward_to(std::move(pr_report));
       }