From 3130582075dabebf0b986ee375911858145efad5 Mon Sep 17 00:00:00 2001
From: xiaoye <50870160+xiaoyewww@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:15:06 +0800
Subject: [PATCH] [clang-tidy] No. 59,60 bugprone-unused-return-value,
 bugprone-suspicious-missing-comma (#56676)

---
 .clang-tidy                                                   | 4 ++--
 paddle/fluid/distributed/fleet_executor/fleet_executor.cc     | 2 +-
 .../ir/mkldnn/compute_propagate_scales_mkldnn_pass.cc         | 2 +-
 paddle/fluid/framework/operator.cc                            | 2 +-
 paddle/fluid/pybind/eager_legacy_op_function_generator.cc     | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index c0b30cf39be..5a4baae37c4 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -32,7 +32,7 @@ bugprone-misplaced-widening-cast,
 -bugprone-string-literal-with-embedded-nul,
 -bugprone-suspicious-enum-usage,
 -bugprone-suspicious-memset-usage,
--bugprone-suspicious-missing-comma,
+bugprone-suspicious-missing-comma,
 -bugprone-suspicious-semicolon,
 -bugprone-suspicious-string-compare,
 -bugprone-terminating-continue,
@@ -42,7 +42,7 @@ bugprone-misplaced-widening-cast,
 -bugprone-undelegated-constructor,
 bugprone-unhandled-self-assignment,
 bugprone-unused-raii,
--bugprone-unused-return-value,
+bugprone-unused-return-value,
 bugprone-use-after-move,
 -bugprone-virtual-near-miss,
 -clang-analyzer-apiModeling.StdCLibraryFunctions,
diff --git a/paddle/fluid/distributed/fleet_executor/fleet_executor.cc b/paddle/fluid/distributed/fleet_executor/fleet_executor.cc
index f2a9f9cc6bf..8daf0636ce8 100644
--- a/paddle/fluid/distributed/fleet_executor/fleet_executor.cc
+++ b/paddle/fluid/distributed/fleet_executor/fleet_executor.cc
@@ -190,7 +190,7 @@ void FleetExecutor::Init(
       framework::GetUnusedVars(program_desc.Block(0), ops, {});
 
   for (auto& unique_op : ops) {
-    unique_op.release();
+    [[maybe_unused]] auto released_op = unique_op.release();
   }
 
   // NOTE: For inference, the vars in inference_root_scope_vars
diff --git a/paddle/fluid/framework/ir/mkldnn/compute_propagate_scales_mkldnn_pass.cc b/paddle/fluid/framework/ir/mkldnn/compute_propagate_scales_mkldnn_pass.cc
index b5d2255a4b9..745e0ffa9cf 100644
--- a/paddle/fluid/framework/ir/mkldnn/compute_propagate_scales_mkldnn_pass.cc
+++ b/paddle/fluid/framework/ir/mkldnn/compute_propagate_scales_mkldnn_pass.cc
@@ -492,7 +492,7 @@ void ComputePropagateScalesMkldnnPass::ApplyImpl(ir::Graph* graph) const {
   FusePassBase::Init(pattern_name, graph);
 
   const std::unordered_set<std::string> scale_immutable_ops = {
-      "fused_transpose"
+      "fused_transpose",
       "transpose2",
       "reshape2",
       "pool2d",
diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index 0c03486fdd7..c095ba849a4 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -2022,7 +2022,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
           ExecutionContext(*this, exec_scope, *dev_ctx, *runtime_ctx));
     }
     if (fallback_to_cpu) {
-      phi_kernel_.release();
+      [[maybe_unused]] auto released_kernel = phi_kernel_.release();
     }
   }
 
diff --git a/paddle/fluid/pybind/eager_legacy_op_function_generator.cc b/paddle/fluid/pybind/eager_legacy_op_function_generator.cc
index b1504ba8f88..e7c9c62e016 100644
--- a/paddle/fluid/pybind/eager_legacy_op_function_generator.cc
+++ b/paddle/fluid/pybind/eager_legacy_op_function_generator.cc
@@ -488,11 +488,11 @@ int main(int argc, char* argv[]) {  // NOLINT
   paddle::operators::RegisterCustomDeviceCommonKernel("fake_device");
 #endif
 
+  const std::string str = "\"paddle/fluid/eager/api/generated/fluid_generated/";
   std::vector<std::string> headers{
       "<Python.h>",
       "\"paddle/fluid/platform/enforce.h\"",
-      "\"paddle/fluid/eager/api/generated/fluid_generated/"
-      "dygraph_forward_api.h\"",
+      str + "dygraph_forward_api.h\"",
       "\"paddle/fluid/pybind/eager_utils.h\"",
       "\"paddle/fluid/platform/profiler/event_tracing.h\"",
       "\"paddle/fluid/pybind/exception.h\"",
-- 
GitLab