Merge pull request #8098 from RazvanN7/Issue_18474

Fix Issue 18474 - Postblit not working in shared structs merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
dlang · Apr 2, 2018 · e1aaf4c · e1aaf4c
2 parents 80157ad + 3a0f75d
commit e1aaf4c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/src/dmd/dsymbolsem.d b/src/dmd/dsymbolsem.d
@@ -242,10 +242,17 @@ private extern (C++) FuncDeclaration buildPostBlit(StructDeclaration sd, Scope*
         postblitCalls.push(new OnScopeStatement(loc, TOK.onScopeFailure, new ExpStatement(loc, ex)));
     }
 
+    void checkShared()
+    {
+        if (sd.type.isShared())
+            stc |= STC.shared_;
+    }
+
     // Build our own "postblit" which executes a, but only if needed.
     if (postblitCalls.dim || (stc & STC.disable))
     {
         //printf("Building __fieldPostBlit()\n");
+        checkShared();
         auto dd = new PostBlitDeclaration(declLoc, Loc.initial, stc, Id.__fieldPostblit);
         dd.generated = true;
         dd.storage_class |= STC.inference;
@@ -283,6 +290,8 @@ private extern (C++) FuncDeclaration buildPostBlit(StructDeclaration sd, Scope*
             ex = new CallExp(loc, ex);
             e = Expression.combine(e, ex);
         }
+
+        checkShared();
         auto dd = new PostBlitDeclaration(declLoc, Loc.initial, stc, Id.__aggrPostblit);
         dd.generated = true;
         dd.storage_class |= STC.inference;

diff --git a/src/dmd/expressionsem.d b/src/dmd/expressionsem.d
@@ -6748,6 +6748,8 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
                              */
                             Expression e = e1x.copy();
                             e.type = e.type.mutableOf();
+                            if (e.type.isShared && !sd.type.isShared)
+                                e.type = e.type.unSharedOf();
                             e = new BlitExp(exp.loc, e, e2x);
                             e = new DotVarExp(exp.loc, e, sd.postblit, false);
                             e = new CallExp(exp.loc, e);

diff --git a/test/compilable/test18474.d b/test/compilable/test18474.d
@@ -0,0 +1,15 @@
+shared struct A
+{
+    this(this);
+}
+
+struct B
+{
+    A a;
+}
+
+void main()
+{
+    shared B b1;
+    auto b2 = b1;
+}