Devirtualize destructors

build/config/compiler/BUILD.gn

@@ -306,11 +306,11 @@ config("strict_warnings") {
     cflags -= [ "-Wshadow" ]
   }
 
-  cflags_cc = [ "-Wnon-virtual-dtor" ]
+  cflags_cc = [ "-Wdelete-non-virtual-dtor" ]
 
   if (current_os == "nuttx") {
     cflags -= [ "-Wshadow" ]
-    cflags_cc -= [ "-Wnon-virtual-dtor" ]
+    cflags_cc -= [ "-Wdelete-non-virtual-dtor" ]
   }
 
   configs = []

src/access/AccessControl.h

@@ -47,9 +47,10 @@ class AccessControl
     struct DeviceTypeResolver
     {
     public:
-        virtual ~DeviceTypeResolver() = default;
-
         virtual bool IsDeviceTypeOnEndpoint(DeviceTypeId deviceType, EndpointId endpoint) = 0;
+
+    protected:
+        ~DeviceTypeResolver() = default;
     };
 
     /**
@@ -76,12 +77,11 @@ class AccessControl
         {
         public:
             Delegate() = default;
+            virtual ~Delegate() = default;
 
             Delegate(const Delegate &)             = delete;
             Delegate & operator=(const Delegate &) = delete;
 
-            virtual ~Delegate() = default;
-
             virtual void Release() {}
 
             // Simple getters
@@ -250,12 +250,11 @@ class AccessControl
         {
         public:
             Delegate() = default;
+            virtual ~Delegate() = default;
 
             Delegate(const Delegate &)             = delete;
             Delegate & operator=(const Delegate &) = delete;
 
-            virtual ~Delegate() = default;
-
             virtual void Release() {}
 
             virtual CHIP_ERROR Next(Entry & entry) { return CHIP_ERROR_SENTINEL; }
@@ -304,8 +303,6 @@ class AccessControl
             kUpdated = 3
         };
 
-        virtual ~EntryListener() = default;
-
         /**
          * Notifies of a change in the access control list.
          *
@@ -322,6 +319,9 @@ class AccessControl
         virtual void OnEntryChanged(const SubjectDescriptor * subjectDescriptor, FabricIndex fabric, size_t index,
                                     const Entry * entry, ChangeType changeType) = 0;
 
+    protected:
+        ~EntryListener() = default;
+
     private:
         EntryListener * mNext = nullptr;
 
@@ -336,8 +336,6 @@ class AccessControl
         Delegate(const Delegate &)             = delete;
         Delegate & operator=(const Delegate &) = delete;
 
-        virtual ~Delegate() = default;
-
         virtual void Release() {}
 
         virtual CHIP_ERROR Init() { return CHIP_NO_ERROR; }
@@ -402,6 +400,9 @@ class AccessControl
         {
             return CHIP_ERROR_ACCESS_DENIED;
         }
+
+    protected:
+        ~Delegate() = default;
     };
 
     AccessControl() = default;

src/credentials/GroupDataProvider.h

@@ -172,7 +172,6 @@ class GroupDataProvider
     class GroupListener
     {
     public:
-        virtual ~GroupListener() = default;
         /**
          *  Callback invoked when a new group is added.
          *
@@ -185,6 +184,9 @@ class GroupDataProvider
          *  @param[in] old_group  GroupInfo structure of the removed group.
          */
         virtual void OnGroupRemoved(FabricIndex fabric_index, const GroupInfo & old_group) = 0;
+
+    protected:
+        ~GroupListener() = default;
     };
 
     using GroupInfoIterator    = CommonIterator<GroupInfo>;

src/crypto/OperationalKeystore.h

@@ -28,8 +28,6 @@ namespace Crypto {
 class OperationalKeystore
 {
 public:
-    virtual ~OperationalKeystore() {}
-
     // ==== API designed for commisionables to support fail-safe (although can be used by controllers) ====
 
     /**
@@ -246,6 +244,9 @@ class OperationalKeystore
      * @brief Release an ephemeral keypair previously provided by `AllocateEphemeralKeypairForCASE()`
      */
     virtual void ReleaseEphemeralKeypair(Crypto::P256Keypair * keypair) = 0;
+
+protected:
+    ~OperationalKeystore() = default;
 };
 
 } // namespace Crypto

src/include/platform/ConfigurationManager.h

@@ -179,13 +179,15 @@ class ConfigurationManager
     virtual CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value)  = 0;
 
     // Construction/destruction limited to subclasses.
-    ConfigurationManager()          = default;
-    virtual ~ConfigurationManager() = default;
+    ConfigurationManager() = default;
 
     // No copy, move or assignment.
     ConfigurationManager(const ConfigurationManager &)             = delete;
     ConfigurationManager(const ConfigurationManager &&)            = delete;
     ConfigurationManager & operator=(const ConfigurationManager &) = delete;
+
+protected:
+    ~ConfigurationManager() = default;
 };
 
 /**

src/include/platform/ConnectivityManager.h

@@ -68,14 +68,15 @@ class ConnectivityManagerImpl;
 class ConnectivityManagerDelegate
 {
 public:
-    virtual ~ConnectivityManagerDelegate() {}
-
     /**
      * @brief
      *   Called when any network interface on the Node is changed
      *
      */
     virtual void OnNetworkInfoChanged() {}
+
+protected:
+    ~ConnectivityManagerDelegate() {}
 };
 
 /**

src/include/platform/DeviceInfoProvider.h

@@ -44,7 +44,6 @@ class DeviceInfoProvider
     class Iterator
     {
     public:
-        virtual ~Iterator() = default;
         /**
          *  @retval The number of entries in total that will be iterated.
          */
@@ -63,6 +62,7 @@ class DeviceInfoProvider
 
     protected:
         Iterator() = default;
+        ~Iterator() = default;
     };
 
     using FixedLabelType = app::Clusters::FixedLabel::Structs::LabelStruct::Type;

src/include/platform/DiagnosticDataProvider.h

@@ -69,8 +69,6 @@ class DiagnosticDataProviderImpl;
 class WiFiDiagnosticsDelegate
 {
 public:
-    virtual ~WiFiDiagnosticsDelegate() {}
-
     /**
      * @brief
      *   Called when the Node detects Node’s Wi-Fi connection has been disconnected.
@@ -88,6 +86,9 @@ class WiFiDiagnosticsDelegate
      *   Called when the Node’s connection status to a Wi-Fi network has changed.
      */
     virtual void OnConnectionStatusChanged(uint8_t connectionStatus) {}
+
+protected:
+    ~WiFiDiagnosticsDelegate() = default;
 };
 
 /**
@@ -96,8 +97,6 @@ class WiFiDiagnosticsDelegate
 class ThreadDiagnosticsDelegate
 {
 public:
-    virtual ~ThreadDiagnosticsDelegate() {}
-
     /**
      * @brief
      *   Called when the Node’s connection status to a Thread network has changed.
@@ -111,6 +110,9 @@ class ThreadDiagnosticsDelegate
     virtual void OnNetworkFaultChanged(const GeneralFaults<kMaxNetworkFaults> & previous,
                                        const GeneralFaults<kMaxNetworkFaults> & current)
     {}
+
+protected:
+    ~ThreadDiagnosticsDelegate() {}
 };
 
 /**

src/include/platform/internal/GenericConfigurationManagerImpl.h

@@ -115,8 +115,6 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
 #endif
     void LogDeviceConfig() override;
 
-    ~GenericConfigurationManagerImpl() override = default;
-
 protected:
 #if CHIP_ENABLE_ROTATING_DEVICE_ID && defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
     chip::LifetimePersistedCounter<uint32_t> mLifetimePersistedCounter;