fix Issue 7152 - Can't assign null to default argument

This had not implemented as a part of issue 7019.
dlang · Jan 9, 2013 · e418d1e · e418d1e
1 parent 08f0048
commit e418d1e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/mtype.c b/src/mtype.c
@@ -5617,9 +5617,9 @@ Type *TypeFunction::semantic(Loc loc, Scope *sc)
 
             if (fparam->defaultArg)
             {   Expression *e = fparam->defaultArg;
-                e = e->inferType(fparam->type);
-                e = e->semantic(argsc);
-                e = resolveProperties(argsc, e);
+                Initializer *init = new ExpInitializer(e->loc, e);
+                init = init->semantic(argsc, fparam->type, INITnointerpret);
+                e = init->toExpression();
                 if (e->op == TOKfunction)               // see Bugzilla 4820
                 {   FuncExp *fe = (FuncExp *)e;
                     // Replace function literal with a function symbol,

diff --git a/test/runnable/declaration.d b/test/runnable/declaration.d
@@ -56,6 +56,12 @@ void test7019()
     static assert(ct_gs == S7019(2) && ct_gs.store == 16);
     static assert(ct_ls == S7019(3) && ct_ls.store == 24);
     static assert(C.ct_fs == S7019(4) && C.ct_fs.store == 32);
+
+    void foo(S7019 s = 5)   // fixing bug 7152
+    {
+        assert(s.store == 5 << 3);
+    }
+    foo();
 }
 
 /***************************************************/