Merge pull request #2592 from 9rnsr/fix_inline_nrvo

Do inline for the variable initialization with NRVO function call
dlang · Nov 8, 2013 · 5ea29c9 · 5ea29c9
2 parents 864fcda + 6f80983
commit 5ea29c9
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 98 deletions.
diff --git a/src/declaration.h b/src/declaration.h
@@ -709,7 +709,7 @@ class FuncDeclaration : public Declaration
     void ctfeCompile();
     void inlineScan();
     int canInline(int hasthis, int hdrscan, int statementsToo);
-    Expression *expandInline(InlineScanState *iss, Expression *ethis, Expressions *arguments, Statement **ps);
+    Expression *expandInline(InlineScanState *iss, Expression *eret, Expression *ethis, Expressions *arguments, Statement **ps);
     const char *kind();
     void toDocBuffer(OutBuffer *buf, Scope *sc);
     FuncDeclaration *isUnique();

diff --git a/src/expression.h b/src/expression.h
@@ -1089,6 +1089,7 @@ class CallExp : public UnaExp
     int inlineCost3(InlineCostState *ics);
     Expression *doInline(InlineDoState *ids);
     Expression *inlineScan(InlineScanState *iss);
+    Expression *inlineScan(InlineScanState *iss, Expression *eret);
 };
 
 class AddrExp : public UnaExp
@@ -1397,6 +1398,9 @@ class AssignExp : public BinExp
     Identifier *opId();    // For operator overloading
     void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
     Expression *buildArrayLoop(Parameters *fparams);
+
+    Expression *inlineScan(InlineScanState *iss);
+
     elem *toElem(IRState *irs);
 };