add OPddtor

src/backend/cdef.h

@@ -958,8 +958,9 @@ union eve
 #if MARS
         struct
         {
-            void *Edecl;        // OPdctor: VarDeclaration being constructed
-        } ed;
+            elem *Eleft;        // left child for OPddtor
+            void *Edecl;        // VarDeclaration being constructed
+        } ed;                   // OPdctor,OPddtor
 #endif
 };                              // variants for each type of elem
 

src/backend/cgcs.c

@@ -269,6 +269,7 @@ STATIC void ecom(elem **pe)
 #if TX86
     case OPinp:                 /* never CSE the I/O instruction itself */
 #endif
+    case OPdctor:
         ecom(&e->E1);
         /* FALL-THROUGH */
     case OPasm:
@@ -278,7 +279,9 @@ STATIC void ecom(elem **pe)
     case OPctor:
     case OPdtor:
     case OPmark:
-    case OPdctor:
+        return;
+
+    case OPddtor:
         return;
 
     case OPparam:

src/backend/cgelem.c

@@ -4018,6 +4018,15 @@ elem *elpair(elem *e)
     return e;
 }
 
+/********************************
+ * Handle OPddtor
+ */
+
+elem *elddtor(elem *e)
+{
+    return e;
+}
+
 /********************************
  * Handle OPinfo, OPmark, OPctor, OPdtor
  */

src/backend/cod2.c

@@ -4654,6 +4654,16 @@ code *cddctor(elem *e,regm_t *pretregs)
     return NULL;
 }
 
+/*******************************************
+ * D destructor.
+ */
+
+code *cdddtor(elem *e,regm_t *pretregs)
+{
+    return NULL;
+}
+
+
 /*******************************************
  * C++ constructor.
  */

src/backend/code.h

@@ -711,6 +711,7 @@ cd_t cdpost;
 cd_t cderr;
 cd_t cdinfo;
 cd_t cddctor;
+cd_t cdddtor;
 cd_t cdctor;
 cd_t cddtor;
 cd_t cdmark;

src/backend/el.c

@@ -2385,7 +2385,7 @@ elem * el_const(tym_t ty,union eve *pconst)
 /**************************
  * Insert constructor information into tree.
  *      e       code to construct the object
- *      var     VarDeclaration of variable being constructed
+ *      decl    VarDeclaration of variable being constructed
  */
 
 #if MARS
@@ -2403,6 +2403,25 @@ elem *el_dctor(elem *e,void *decl)
 }
 #endif
 
+/**************************
+ * Insert destructor information into tree.
+ *      e       code to destruct the object
+ *      decl    VarDeclaration of variable being destructed
+ *              (must match decl for corresponding OPctor)
+ */
+
+#if MARS
+elem *el_ddtor(elem *e,void *decl)
+{
+    elem *edtor = el_calloc();
+    edtor->Eoper = OPddtor;
+    edtor->Ety = TYvoid;
+    edtor->EV.ed.Edecl = decl;
+    edtor->EV.ed.Eleft = e;
+    return edtor;
+}
+#endif
+
 /**************************
  * Insert constructor information into tree.
  *      ector   pointer to object being constructed

src/backend/el.h

@@ -1,5 +1,5 @@
 // Copyright (C) 1985-1995 by Symantec
-// Copyright (C) 2000-2010 by Digital Mars
+// Copyright (C) 2000-2011 by Digital Mars
 // All Rights Reserved
 // http://www.digitalmars.com
 // Written by Walter Bright
@@ -223,6 +223,7 @@ elem_p el_long(tym_t,targ_long);
 int ERTOL(elem_p);
 int el_noreturn(elem_p);
 elem *el_dctor(elem *e,void *decl);
+elem *el_ddtor(elem *e,void *decl);
 elem *el_ctor(elem *ector,elem *e,symbol *sdtor);
 elem *el_dtor(elem *edtor,elem *e);
 elem *el_zero(type *t);

src/backend/gdag.c

@@ -1,5 +1,5 @@
 // Copyright (C) 1986-1998 by Symantec
-// Copyright (C) 2000-2009 by Digital Mars
+// Copyright (C) 2000-2011 by Digital Mars
 // All Rights Reserved
 // http://www.digitalmars.com
 // Written by Walter Bright

src/backend/glocal.c

@@ -165,6 +165,13 @@ STATIC void local_exp(elem *e,int goal)
             loctop = 0;         // don't move expressions across ctor/dtor
             break;              // boundaries, it would goof up EH cleanup
 
+        case OPddtor:
+            loctop = 0;         // don't move expressions across ctor/dtor
+                                // boundaries, it would goof up EH cleanup
+            local_exp(e->E1,0);
+            loctop = 0;
+            break;
+
         case OPeq:
         case OPstreq:
             e1 = e->E1;

src/backend/gloop.c

@@ -1,5 +1,5 @@
 // Copyright (C) 1985-1998 by Symantec
-// Copyright (C) 2000-2009 by Digital Mars
+// Copyright (C) 2000-2011 by Digital Mars
 // All Rights Reserved
 // http://www.digitalmars.com
 // Written by Walter Bright
@@ -1292,6 +1292,7 @@ STATIC void markinvar(elem *n,vec_t rd)
         case OPctor:
         case OPdtor:
         case OPdctor:
+        case OPddtor:
         case OPhalt:
         case OPgot:                     // shouldn't OPgot be makeLI ?
                 break;

src/backend/gother.c

@@ -1,5 +1,5 @@
 // Copyright (C) 1986-1998 by Symantec
-// Copyright (C) 2000-2010 by Digital Mars
+// Copyright (C) 2000-2011 by Digital Mars
 // All Rights Reserved
 // http://www.digitalmars.com
 // Written by Walter Bright

src/backend/oper.h

@@ -262,6 +262,8 @@ TARGET_CONVERSION_OPS
         OPdtor,
         OPmark,
         OPdctor,                // D constructor
+        OPddtor,                // D destructor
+
         OPpair,                 // build register pair, E1 is lsb, E2 = msb
         OPrpair,                // build reversed register pair, E1 is msb, E2 = lsb
         OPframeptr,             // load pointer to base of frame

src/backend/optabgen.c

@@ -63,6 +63,7 @@ int _unary[] =
          OPinp,OPptrlptr,OPtofar16,OPfromfar16,OParrow,OPnegass,
          OPctor,OPdtor,OPsetjmp,OPvoid,OParraylength,
          OPbsf,OPbsr,OPbswap,
+         OPddtor,
         };
 int _commut[] = {OPadd,OPand,OPor,OPxor,OPmul,OPeqeq,OPne,OPle,OPlt,OPge,OPgt,
          OPunord,OPlg,OPleg,OPule,OPul,OPuge,OPug,OPue,OPngt,OPnge,
@@ -109,7 +110,7 @@ int _sideff[] = {OPasm,OPucall,OPstrcpy,OPmemcpy,OPmemset,OPstrcat,
                 OPinp,OPoutp,OPnegass,OPctor,OPdtor,OPmark,OPvoid,OPnewarray,
                 OPmultinewarray,OPcheckcast,OPnullcheck,
                 OPbtc,OPbtr,OPbts,
-                OPhalt,OPdctor,
+                OPhalt,OPdctor,OPddtor,
                 };
 int _rtol[] = {OPeq,OPstreq,OPstrcpy,OPmemcpy,OPpostinc,OPpostdec,OPaddass,
                 OPminass,OPmulass,OPdivass,OPmodass,OPandass,
@@ -444,6 +445,7 @@ void dotab()
         case OPasm:     X("asm",        elzot, cdasm);
         case OPinfo:    X("info",       elinfo,cdinfo);
         case OPdctor:   X("dctor",      elzot, cddctor);
+        case OPddtor:   X("ddtor",      elddtor, cdddtor);
         case OPctor:    X("ctor",       elinfo,cdctor);
         case OPdtor:    X("dtor",       elinfo,cddtor);
         case OPmark:    X("mark",       elinfo,cdmark);

src/backend/out.c

@@ -1,5 +1,5 @@
 // Copyright (C) 1984-1998 by Symantec
-// Copyright (C) 2000-2009 by Digital Mars
+// Copyright (C) 2000-2011 by Digital Mars
 // All Rights Reserved
 // http://www.digitalmars.com
 // Written by Walter Bright