Fix dtor handling issue introduced by fixing 3825

Commit: d5aac8c Message: fix Issue 3825 - AAs entries are default initialized before the new value is evaluated https://github.com/D-Programming-Language/dmd/pull/1465/files#diff-31ec3d6838ade0264adec0944948507dR12919 https://github.com/D-Programming-Language/dmd/pull/1465/files#diff-31ec3d6838ade0264adec0944948507dR12928
dlang · Oct 23, 2013 · 7c6d516 · 7c6d516
1 parent 325ea56
commit 7c6d516
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -14083,7 +14083,6 @@ Expression *BinExp::reorderSettingAAElem(Scope *sc)
     {
         Identifier *id = Lexer::uniqueId("__aatmp");
         VarDeclaration *vd = new VarDeclaration(ie->e1->loc, ie->e1->type, id, new ExpInitializer(ie->e1->loc, ie->e1));
-        vd->storage_class |= STCref | STCforeach;
         Expression *de = new DeclarationExp(ie->e1->loc, vd);
 
         ec = de;
@@ -14093,7 +14092,8 @@ Expression *BinExp::reorderSettingAAElem(Scope *sc)
     {
         Identifier *id = Lexer::uniqueId("__aakey");
         VarDeclaration *vd = new VarDeclaration(ie->e2->loc, ie->e2->type, id, new ExpInitializer(ie->e2->loc, ie->e2));
-        vd->storage_class |= STCref | STCforeach;
+        if (ie->e2->isLvalue())
+            vd->storage_class |= STCref | STCforeach;
         Expression *de = new DeclarationExp(ie->e2->loc, vd);
 
         ec = ec ? new CommaExp(loc, ec, de) : de;

diff --git a/test/runnable/testaa2.d b/test/runnable/testaa2.d
@@ -222,6 +222,38 @@ void test3825()
     bug8070();
 }
 
+void test3825x()
+{
+    static int ctor, cpctor, dtor;
+
+    static struct S
+    {
+        this(int)  { ++ctor; }
+        this(this) { ++cpctor; }
+        ~this()    { ++dtor; }
+    }
+
+    {
+        auto value = S(1);
+        assert(ctor==1 && cpctor==0 && dtor==0);
+
+        ref getRef(ref S s = value) { return s; }
+        auto getVal() { return value; }
+        int[S] aa;
+
+        aa[value] = 10;
+        assert(ctor==1 && cpctor==0 && dtor==0);
+
+        aa[getRef()] += 1;
+        assert(ctor==1 && cpctor==0 && dtor==0);
+
+        aa[getVal()] += 1;
+        assert(ctor==1 && cpctor==1 && dtor==1);
+    }
+    assert(ctor==1 && cpctor==1 && dtor==2);
+    assert(ctor + cpctor == dtor);
+}
+
 /************************************************/
 // 10106
 
@@ -252,6 +284,7 @@ int main()
     test1899();
     test4523();
     test3825();
+    test3825x();
 
     printf("Success\n");
     return 0;