fix issue 3490 - DMD Never Inlines Functions that Could Throw

dlang · Mar 12, 2014 · 8f3557c · 8f3557c
1 parent a707998
commit 8f3557c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/inline.c b/src/inline.c
@@ -200,6 +200,12 @@ class InlineCostVisitor : public Visitor
         //printf("ForStatement: inlineCost = %d\n", cost);
     }
 
+    void visit(ThrowStatement *s)
+    {
+        cost += STATEMENT_COST;
+        s->exp->accept(this);
+    }
+
     /* -------------------------- */
 
     void expressionInlineCost(Expression *e)
@@ -500,6 +506,12 @@ Statement *inlineAsStatement(Statement *s, InlineDoState *ids)
             Statement *body = s->body ? inlineAsStatement(s->body, ids) : NULL;
             result = new ForStatement(s->loc, init, condition, increment, body);
         }
+
+        void visit(ThrowStatement *s)
+        {
+            //printf("ThrowStatement::inlineAsStatement() '%s'\n", s->exp->toChars());
+            result = new ThrowStatement(s->loc, doInline(s->exp, ids));
+        }
     };
 
     InlineAsStatement v(ids);