DIP25: don't forget opAssign

dlang · Jan 26, 2015 · 3f2404d · 3f2404d
1 parent 6e5d1c9
commit 3f2404d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/clone.c b/src/clone.c
@@ -203,7 +203,7 @@ FuncDeclaration *buildOpAssign(StructDeclaration *sd, Scope *sc)
     if (!needOpAssign(sd))
         return NULL;
 
-    //printf("StructDeclaration::buildOpAssign() %s\n", toChars());
+    //printf("StructDeclaration::buildOpAssign() %s\n", sd->toChars());
     StorageClass stc = STCsafe | STCnothrow | STCpure | STCnogc;
     Loc declLoc = sd->loc;
     Loc loc = Loc();    // internal code should have no loc to prevent coverage
@@ -238,7 +238,7 @@ FuncDeclaration *buildOpAssign(StructDeclaration *sd, Scope *sc)
 
     Parameters *fparams = new Parameters;
     fparams->push(new Parameter(STCnodtor, sd->type, Id::p, NULL));
-    Type *tf = new TypeFunction(fparams, sd->handleType(), 0, LINKd, stc | STCref);
+    TypeFunction *tf = new TypeFunction(fparams, sd->handleType(), 0, LINKd, stc | STCref);
 
     FuncDeclaration *fop = new FuncDeclaration(declLoc, Loc(), Id::assign, stc, tf);
 
@@ -302,6 +302,7 @@ FuncDeclaration *buildOpAssign(StructDeclaration *sd, Scope *sc)
         Statement *s2 = new ReturnStatement(loc, e);
 
         fop->fbody = new CompoundStatement(loc, s1, s2);
+        tf->isreturn = true;
     }
 
     sd->members->push(fop);

diff --git a/src/escape.c b/src/escape.c
@@ -291,7 +291,10 @@ bool checkEscapeRef(Scope *sc, Expression *e, bool gag)
                         }
                     }
                     else if (sc->module && sc->module->isRoot())
+                    {
+                        //printf("escaping reference to local ref variable %s\n", v->toChars());
                         error(loc, "escaping reference to local ref variable %s", v);
+                    }
                     return;
                 }
 

diff --git a/test/runnable/testscope2.d b/test/runnable/testscope2.d
@@ -177,6 +177,31 @@ struct S10
 
 /********************************************/
 
+struct RC
+{
+    this(this) { }
+}
+
+struct S11
+{
+    @disable this(this);
+
+    void remove()
+    {
+	_ptr[0] = _ptr[1];
+    }
+
+    RC* _ptr;
+}
+
+
+void test11()
+{
+    S11 ary;
+}
+
+/********************************************/
+
 void main()
 {
     test3();
@@ -185,6 +210,7 @@ void main()
     test6();
     test7();
     test8();
+    test11();
     printf("Success\n");
 }