fix Issue 12822 - Delegate .ptr assignment considered @safe

dlang · Jun 12, 2016 · 51143be · 51143be
1 parent 26c2213
commit 51143be
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/src/expression.d b/src/expression.d
@@ -11914,6 +11914,16 @@ extern (C++) final class DelegatePtrExp : UnaExp
         return this;
     }
 
+    override Expression modifiableLvalue(Scope* sc, Expression e)
+    {
+        if (sc.func.setUnsafe())
+        {
+            error("cannot modify delegate pointer in @safe code %s", toChars());
+            return new ErrorExp();
+        }
+        return Expression.modifiableLvalue(sc, e);
+    }
+
     override void accept(Visitor v)
     {
         v.visit(this);
@@ -11957,6 +11967,16 @@ extern (C++) final class DelegateFuncptrExp : UnaExp
         return this;
     }
 
+    override Expression modifiableLvalue(Scope* sc, Expression e)
+    {
+        if (sc.func.setUnsafe())
+        {
+            error("cannot modify delegate function pointer in @safe code %s", toChars());
+            return new ErrorExp();
+        }
+        return Expression.modifiableLvalue(sc, e);
+    }
+
     override void accept(Visitor v)
     {
         v.visit(this);

diff --git a/src/tokens.d b/src/tokens.d
@@ -674,6 +674,7 @@ extern (C++) struct Token
         TOKon_scope_exit: "scope(exit)",
         TOKon_scope_success: "scope(success)",
         TOKon_scope_failure: "scope(failure)",
+        TOKdelegateptr: "delegateptr",
     ];
 
     static this()

diff --git a/test/fail_compilation/test12822.d b/test/fail_compilation/test12822.d
@@ -0,0 +1,16 @@
+/*
+---
+fail_compilation/test12822.d(11): Error: cannot modify delegate pointer in @safe code dg.ptr
+fail_compilation/test12822.d(12): Error: cannot modify delegate function pointer in @safe code dg.ptr
+---
+*/
+
+// https://issues.dlang.org/show_bug.cgi?id=12822
+void test2(int delegate() dg) @safe
+{
+    static int i;
+    dg.ptr = &i;
+    dg.funcptr = &func;
+}
+
+int func();