more functions inlined

dlang · Dec 30, 2011 · 90a9638 · 90a9638 · CyberShadow · May 9, 2015
1 parent c268c4a
commit 90a9638
Show file tree

Hide file tree

Showing 5 changed files with 265 additions and 34 deletions.
diff --git a/src/declaration.h b/src/declaration.h
@@ -553,7 +553,8 @@ struct FuncDeclaration : Declaration
     Loc endloc;                         // location of closing curly bracket
     int vtblIndex;                      // for member functions, index into vtbl[]
     int naked;                          // !=0 if naked
-    ILS inlineStatus;
+    ILS inlineStatusStmt;
+    ILS inlineStatusExp;
     int inlineNest;                     // !=0 if nested inline
     int isArrayOp;                      // !=0 if array operation
     enum PASS semanticRun;
@@ -646,8 +647,8 @@ struct FuncDeclaration : Declaration
     virtual int addPostInvariant();
     Expression *interpret(InterState *istate, Expressions *arguments, Expression *thisexp = NULL);
     void inlineScan();
-    int canInline(int hasthis, int hdrscan = 0);
-    Expression *doInline(InlineScanState *iss, Expression *ethis, Expressions *arguments);
+    int canInline(int hasthis, int hdrscan, int statementsToo);
+    Expression *expandInline(InlineScanState *iss, Expression *ethis, Expressions *arguments, Statement **ps);
     const char *kind();
     void toDocBuffer(OutBuffer *buf);
     FuncDeclaration *isUnique();

diff --git a/src/func.c b/src/func.c
@@ -64,7 +64,8 @@ FuncDeclaration::FuncDeclaration(Loc loc, Loc endloc, Identifier *id, StorageCla
     vtblIndex = -1;
     hasReturnExp = 0;
     naked = 0;
-    inlineStatus = ILSuninitialized;
+    inlineStatusExp = ILSuninitialized;
+    inlineStatusStmt = ILSuninitialized;
     inlineNest = 0;
     isArrayOp = 0;
     semanticRun = PASSinit;
@@ -1755,7 +1756,7 @@ int FuncDeclaration::equals(Object *o)
 void FuncDeclaration::bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
     if (fbody &&
-        (!hgs->hdrgen || hgs->tpltMember || canInline(1,1))
+        (!hgs->hdrgen || hgs->tpltMember || canInline(1,1,1))
        )
     {   buf->writenl();