On Fri, Feb 7, 2020 at 12:41 PM Luc Van Oostenryck
<luc.vanoostenryck@xxxxxxxxx> wrote:
>
> I never saw it so badly but it's not the first time I've bitten by
> the very early inlining. Independently of this, it would be handy to
> have an inliner at IR level, it shouldn't be very difficult but ...
> OTOH, it should really be straightforward would be to separate the
> current tree inliner from the type evaluation and instead run it just
> after expansion. The downsides would be:
> * the tree would need to be walked once more;
Actually, if we were to do the inlining _during_ expansion, we
wouldn't add a new phase.
> * this may make the expansion less useful but it could be run again
> after the inlining.
Same comment: how about doing it as part of the expansion phase?
This is where we handle the built-ins too, it would kind of make sense
to do inlining in expand_symbol_call(), I feel. An inline function is
a "builtin" that the user has defined, after all.
And if we do it in that phase, we'd automatically avoid it for
conditional expressions with a static conditional value, because
expansion does the obvious trivial simplification as it goes along,
and never expands the side that is trivially not seen.
Something like the attached completely broken patch. It builds but
doesn't work, because "inline_function()" is currently designed to
work during evaluation, not during expansion.
So the patch is complete garbage, but maybe could be the starting
point for something that works.
Linus
diff --git a/evaluate.c b/evaluate.c
index f1a266be..b7bb1f52 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -3107,22 +3107,6 @@ static int evaluate_symbol_call(struct expression *expr)
if (ctype->op && ctype->op->evaluate)
return ctype->op->evaluate(expr);
- if (ctype->ctype.modifiers & MOD_INLINE) {
- int ret;
- struct symbol *curr = current_fn;
-
- if (ctype->definition)
- ctype = ctype->definition;
-
- current_fn = ctype->ctype.base_type;
-
- ret = inline_function(expr, ctype);
-
- /* restore the old function */
- current_fn = curr;
- return ret;
- }
-
return 0;
}
diff --git a/expand.c b/expand.c
index 36612c86..a4f26461 100644
--- a/expand.c
+++ b/expand.c
@@ -910,6 +910,15 @@ static int expand_symbol_call(struct expression *expr, int cost)
if (fn->type != EXPR_PREOP)
return SIDE_EFFECTS;
+ if (ctype->ctype.modifiers & MOD_INLINE) {
+ struct symbol *def;
+
+ def = ctype->definition ? ctype->definition : ctype;
+ if (inline_function(expr, def))
+ return expand_expression(expr);
+ }
+
+
if (ctype->op && ctype->op->expand)
return ctype->op->expand(expr, cost);
