fix Issue 13503 - Bad code with -inline, varargs and auto return

dlang · Sep 22, 2014 · ff6e7d6 · ff6e7d6
1 parent 3c5d1cd
commit ff6e7d6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/func.c b/src/func.c
@@ -1639,8 +1639,9 @@ void FuncDeclaration::semantic3(Scope *sc)
             {
                 if (storage_class & STCauto)
                     storage_class &= ~STCauto;
-                nrvo_can = 0;
             }
+            if (retStyle(f) != RETstack)
+                nrvo_can = 0;
 
             if (isStaticCtorDeclaration())
             {

diff --git a/src/inline.c b/src/inline.c
@@ -1355,7 +1355,7 @@ class InlineScanVisitor : public Visitor
         if (e->op == TOKconstruct && e->e2->op == TOKcall)
         {
             CallExp *ce = (CallExp *)e->e2;
-            if (ce->f && ce->f->nrvo_var)   // NRVO
+            if (ce->f && ce->f->nrvo_can && ce->f->nrvo_var)   // NRVO
             {
                 if (e->e1->op == TOKvar)
                 {
@@ -1774,7 +1774,7 @@ static Expression *expandInline(FuncDeclaration *fd, FuncDeclaration *parent,
     TypeFunction *tf = (TypeFunction*)fd->type;
 
 #if LOG || CANINLINE_LOG
-    printf("FuncDeclaration::expandInline('%s')\n", toChars());
+    printf("FuncDeclaration::expandInline('%s')\n", fd->toChars());
 #endif
 
     memset(&ids, 0, sizeof(ids));

diff --git a/test/runnable/inline.d b/test/runnable/inline.d
@@ -530,6 +530,32 @@ class Foo12080
     }
 }
 
+/**********************************/
+// 13503
+
+void f13503a(string[] s...)
+{
+    assert(s[0] == "Cheese");
+}
+
+auto f13503b(string arg)
+{
+    string result = arg;
+    return result;
+}
+
+string f13503c(string arg)
+{
+    string result = arg;
+    return result;
+}
+
+void test13503()
+{
+    f13503a(f13503b("Cheese"));
+    f13503a(f13503c("Cheese"));
+}
+
 /**********************************/
 
 int main()
@@ -551,6 +577,7 @@ int main()
     test11224();
     test11322();
     test11394();
+    test13503();
 
     printf("Success\n");
     return 0;