Changeset c84dd61 for libcfa/src/virtual_dtor.hfa

Timestamp:

Jun 21, 2023, 2:38:55 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

92355883

Parents:

0b0a285 (diff), 2de175ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/virtual_dtor.hfa (modified) (1 diff)

libcfa/src/virtual_dtor.hfa

@@ -25 +25 @@
     __virtual_obj_start = &this;
 }
-static inline void __CFA_dtor_shutdown( virtual_dtor & this ) with(this) {
+static inline bool __CFA_dtor_shutdown( virtual_dtor & this ) with(this) {
+    if ( __virtual_dtor_ptr == 1p ) return true; // stop base dtors from being called twice
     if ( __virtual_dtor_ptr ) {
         void (*dtor_ptr)(virtual_dtor &) = __virtual_dtor_ptr;
         __virtual_dtor_ptr = 0p;
-        dtor_ptr(*((virtual_dtor *)__virtual_obj_start)); // replace actor with base type
-        return;
+        dtor_ptr(*((virtual_dtor *)__virtual_obj_start)); // call most derived dtor
+        __virtual_dtor_ptr = 1p; // stop base dtors from being called twice
+        return true;
     }
+    return false;
 }
 static inline void __CFA_virt_free( virtual_dtor & this ) { free( this.__virtual_obj_start ); }