Merge pull request #483 from CopernicaMarketingSoftware/34296

Improve performance of destructing objects
CopernicaMarketingSoftware · Aug 4, 2021 · 7394e67 · 7394e67
2 parents 26cbf1e + 3db7eed
commit 7394e67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/zend/base.cpp b/zend/base.cpp
@@ -17,9 +17,8 @@ namespace Php {
  */
 void Base::__destruct() const
 {
-    // throw exception, so that the PHP-CPP library will check if the user
-    // somehow registered an explicit __destruct method
-    throw NotImplemented();
+    // destroy the object by default
+    zend_objects_destroy_object(_impl->php());
 }
 
 /**

diff --git a/zend/classimpl.cpp b/zend/classimpl.cpp
@@ -1130,7 +1130,9 @@ void ClassImpl::destructObject(zend_object *object)
     }
     catch (const NotImplemented &exception)
     {
-        // fallback on the default destructor call
+        // fallback on the default destructor call in case a derived object
+        // of Base throws this. The default implementation will call this
+        // function in any case.
         zend_objects_destroy_object(object);
     }
     catch (Throwable &throwable)