Add a LangPlugin.mustCallerCallDtorOnArguments() hook.

Syniurge · Oct 29, 2019 · 361006f · 361006f
1 parent 10b2464
commit 361006f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/dmd/cpp/calypso.h b/dmd/cpp/calypso.h
@@ -190,6 +190,8 @@ class LangPlugin final : public ::LangPlugin, public ::ForeignCodeGen
     Expression *callCpCtor(Scope *sc, Expression *e) override;
     Expression *constructCtorCall(const Loc& loc, Scope *sc, Expression *e1, Expression* e2) override;
 
+    bool mustCallerCallDtorOnArguments() override { return true; }
+
     ::FuncDeclaration *searchOpEqualsForXopEquals(::StructDeclaration *sd, Scope *sc) override;
 
     Expression* op_overload(Expression* e, Scope* sc, TOK* pop = nullptr) override;

diff --git a/dmd/dimport.d b/dmd/dimport.d
@@ -370,6 +370,8 @@ public:
     Expression callCpCtor(Scope *sc, Expression e);
     Expression constructCtorCall(const ref Loc loc, Scope* sc, Expression e1, Expression e2);
 
+    bool mustCallerCallDtorOnArguments();
+
     FuncDeclaration searchOpEqualsForXopEquals(StructDeclaration sd, Scope *sc);
 
     // ===== - - - - - ===== //

diff --git a/dmd/expressionsem.d b/dmd/expressionsem.d
@@ -2312,12 +2312,18 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
                     if (!isRef)
                     {
                         arg = doCopyOrMove(sc, arg, parameter ? parameter.type : null);
-                        if (tv.getAggregateSym().langPlugin()) // D20180120T151603 CALYPSO NOTE: in D dtors on value arguments are called in by the callee, in C++ by the caller.
-                                                               // But in order to simplify the code and make calling D functions taking C++ struct or class arguments from C++ possible, D sticks to the C++ way, i.e C++ dtors always get called by the caller
+
+                        // D20180120T151603 CALYPSO NOTE: in D dtors on value arguments are called in
+                        // by the callee, in C++ by the caller.
+                        // But in order to simplify the code and make calling D functions taking
+                        // C++ struct or class arguments from C++ possible, D sticks to the C++ way,
+                        // i.e C++ dtors always get called by the caller.
+                        auto lp = tv.getAggregateSym().langPlugin();
+                        if (lp && lp.mustCallerCallDtorOnArguments())
                             arg = arg.addDtorHook(sc);
                     }
                     else if (!arg.isLvalue())
-                        arg = arg.addDtorHook(sc); // CALYPSO: for an rvalue passed to a scope ref aggregate parameter, the dtor has to get called afterwards // LDC 1.17 FIXME?
+                        arg = arg.addDtorHook(sc); // CALYPSO: for an rvalue passed to a ref aggregate parameter, the dtor has to get called afterwards
                 }
             }
 

diff --git a/dmd/import.h b/dmd/import.h
@@ -103,6 +103,8 @@ class LangPlugin
     virtual Expression *callCpCtor(Scope *sc, Expression *e) = 0;
     virtual Expression *constructCtorCall(const Loc& loc, Scope *sc, Expression *e1, Expression* e2) = 0;
 
+    virtual bool mustCallerCallDtorOnArguments() = 0;
+
     virtual FuncDeclaration *searchOpEqualsForXopEquals(StructDeclaration *sd, Scope *sc) = 0;
 
     // ===== - - - - - ===== //