From 6dd9a024f710d957dd70f1f49e28b421ed08827a Mon Sep 17 00:00:00 2001
From: xiaoye <50870160+xiaoyewww@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:16:20 +0800
Subject: [PATCH] [clang-tidy] No. 57,58
 cppcoreguidelines-explicit-virtual-functions
 clang-analyzer-core.NonNullParamChecker (#56649)

---
 .clang-tidy                                                | 4 ++--
 paddle/fluid/memory/allocation/naive_best_fit_allocator.cc | 3 +--
 paddle/phi/kernels/cpu/rnn_functor.h                       | 7 +++++++
 paddle/phi/kernels/cpu/rnn_kernel.cc                       | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 5a4baae37c4..97212817644 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -53,7 +53,7 @@ bugprone-use-after-move,
 -clang-analyzer-core.CallAndMessage,
 -clang-analyzer-core.DivideZero,
 -clang-analyzer-core.DynamicTypePropagation,
--clang-analyzer-core.NonNullParamChecker,
+clang-analyzer-core.NonNullParamChecker,
 -clang-analyzer-core.NonnilStringConstants,
 -clang-analyzer-core.NullDereference,
 -clang-analyzer-core.StackAddrEscapeBase,
@@ -154,7 +154,7 @@ clang-analyzer-unix.Vfork,
 cppcoreguidelines-avoid-c-arrays,
 -cppcoreguidelines-avoid-goto,
 cppcoreguidelines-c-copy-assignment-signature,
--cppcoreguidelines-explicit-virtual-functions,
+cppcoreguidelines-explicit-virtual-functions,
 -cppcoreguidelines-init-variables,
 -cppcoreguidelines-narrowing-conversions,
 -cppcoreguidelines-no-malloc,
diff --git a/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc b/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc
index 1493913f5b2..d39cb285517 100644
--- a/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc
+++ b/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc
@@ -386,8 +386,7 @@ void *Alloc<platform::CUDAPinnedPlace>(const platform::CUDAPinnedPlace &place,
   if (ptr == nullptr) {
     LOG(WARNING) << "cudaHostAlloc Cannot allocate " << size
                  << " bytes in CUDAPinnedPlace";
-  }
-  if (FLAGS_init_allocated_mem) {
+  } else if (FLAGS_init_allocated_mem) {
     memset(ptr, 0xEF, size);
   }
   return ptr;
diff --git a/paddle/phi/kernels/cpu/rnn_functor.h b/paddle/phi/kernels/cpu/rnn_functor.h
index d711998184d..87b533799ba 100644
--- a/paddle/phi/kernels/cpu/rnn_functor.h
+++ b/paddle/phi/kernels/cpu/rnn_functor.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include "paddle/fluid/platform/enforce.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/generator.h"
 #include "paddle/phi/core/tensor_utils.h"
@@ -344,6 +345,12 @@ void RnnFunc(const Context& dev_ctx,
   auto last_h_unbind = Unbind(*last_h);
   std::vector<DenseTensor> init_c_unbind, last_c_unbind;
   if (is_lstm(cell_type)) {
+    PADDLE_ENFORCE_NOT_NULL(
+        init_c,
+        paddle::platform::errors::InvalidArgument("init_c contains no data."));
+    PADDLE_ENFORCE_NOT_NULL(
+        last_c,
+        paddle::platform::errors::InvalidArgument("last_c contains no data."));
     init_c_unbind = Unbind(*init_c);
     last_c_unbind = Unbind(*last_c);
   }
diff --git a/paddle/phi/kernels/cpu/rnn_kernel.cc b/paddle/phi/kernels/cpu/rnn_kernel.cc
index b2e7dd19faf..a861f669647 100644
--- a/paddle/phi/kernels/cpu/rnn_kernel.cc
+++ b/paddle/phi/kernels/cpu/rnn_kernel.cc
@@ -706,7 +706,7 @@ struct SingleLayer : public Layer<T, CellType> {
                   DenseTensor* cell_value,
                   DenseTensor* cell_act_value,
                   const std::string& mode,
-                  bool is_test) {
+                  bool is_test) override {
     this->RunIter(dev_ctx,
                   input,
                   vec,
@@ -745,7 +745,7 @@ struct BidirLayer : public Layer<T, CellType> {
                   DenseTensor* cell_value,
                   DenseTensor* cell_act_value,
                   const std::string& mode,
-                  bool is_test) {
+                  bool is_test) override {
     std::vector<DenseTensor> output_vec(2);
     DenseTensor forward_input_w, forward_cell_value, forward_cell_act_value;
     DenseTensor backward_input_w, backward_cell_value, backward_cell_act_value;
-- 
GitLab