+ string result_name = InlineContentInjector().apply(*stage, *current_function, *current_block, insert_point, call);
+
+ // This will later get removed by UnusedVariableRemover.
+ if(result_name.empty())
+ result_name = "_msp_unused_from_inline";
+
+ RefPtr<VariableReference> ref = new VariableReference;
+ ref->name = result_name;
+ r_inline_result = ref;
+
+ /* Inlined variables need to be resolved before this function can be
+ inlined further. */
+ inlineable.erase(current_function);
+ r_inlined_here = true;
+ }
+}
+
+void FunctionInliner::visit(FunctionDeclaration &func)
+{
+ SetForScope<FunctionDeclaration *> set_func(current_function, &func);
+ TraversingVisitor::visit(func);
+ r_inlined_here = false;
+}
+
+void FunctionInliner::visit(Iteration &iter)
+{
+ /* Visit the initialization statement before entering the loop body so the
+ inlined statements get inserted outside. */
+ if(iter.init_statement)
+ iter.init_statement->visit(*this);
+
+ SetForScope<Block *> set_block(current_block, &iter.body);
+ /* Skip the condition and loop expression parts because they're not properly
+ inside the body block. Inlining anything into them will require a more
+ comprehensive transformation. */
+ iter.body.visit(*this);
+}
+
+
+ExpressionInliner::ExpressionInfo::ExpressionInfo():
+ expression(0),
+ assign_scope(0),
+ inline_point(0),
+ trivial(false),
+ available(true)
+{ }
+
+
+ExpressionInliner::ExpressionInliner():
+ r_ref_info(0),
+ r_any_inlined(false),
+ r_trivial(false),
+ mutating(false),
+ iteration_init(false),
+ iteration_body(0),
+ r_oper(0)
+{ }
+
+bool ExpressionInliner::apply(Stage &s)
+{
+ s.content.visit(*this);
+ return r_any_inlined;
+}
+
+void ExpressionInliner::inline_expression(Expression &expr, RefPtr<Expression> &ptr)
+{
+ ptr = expr.clone();
+ r_any_inlined = true;
+}
+
+void ExpressionInliner::visit(Block &block)
+{
+ TraversingVisitor::visit(block);
+
+ for(map<string, VariableDeclaration *>::iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
+ {
+ map<Assignment::Target, ExpressionInfo>::iterator j = expressions.lower_bound(i->second);
+ for(; (j!=expressions.end() && j->first.declaration==i->second); )
+ {
+ if(j->second.expression && j->second.inline_point)
+ inline_expression(*j->second.expression, *j->second.inline_point);
+
+ expressions.erase(j++);
+ }
+ }
+
+ /* Expressions assigned in this block may depend on local variables of the
+ block. If this is a conditionally executed block, the assignments might not
+ always happen. Mark the expressions as not available to any outer blocks. */
+ for(map<Assignment::Target, ExpressionInfo>::iterator i=expressions.begin(); i!=expressions.end(); ++i)
+ if(i->second.assign_scope==&block)
+ i->second.available = false;
+}
+
+void ExpressionInliner::visit(RefPtr<Expression> &expr)
+{
+ r_ref_info = 0;
+ expr->visit(*this);
+ if(r_ref_info && r_ref_info->expression && r_ref_info->available)
+ {
+ if(iteration_body && !r_ref_info->trivial)
+ {
+ /* Don't inline non-trivial expressions which were assigned outside
+ an iteration statement. The iteration may run multiple times, which
+ would cause the expression to also be evaluated multiple times. */
+ Block *i = r_ref_info->assign_scope;
+ for(; (i && i!=iteration_body); i=i->parent) ;
+ if(!i)
+ return;
+ }
+
+ if(r_ref_info->trivial)
+ inline_expression(*r_ref_info->expression, expr);
+ else
+ /* Record the inline point for a non-trivial expression but don't
+ inline it yet. It might turn out it shouldn't be inlined after all. */
+ r_ref_info->inline_point = &expr;
+ }
+ r_oper = expr->oper;
+ r_ref_info = 0;
+}
+
+void ExpressionInliner::visit(VariableReference &var)
+{
+ if(var.declaration)
+ {
+ map<Assignment::Target, ExpressionInfo>::iterator i = expressions.find(var.declaration);
+ if(i!=expressions.end())
+ {
+ /* If a non-trivial expression is referenced multiple times, don't
+ inline it. */
+ if(i->second.inline_point && !i->second.trivial)
+ i->second.expression = 0;
+ /* Mutating expressions are analogous to self-referencing assignments
+ and prevent inlining. */
+ if(mutating)
+ i->second.expression = 0;
+ r_ref_info = &i->second;
+ }
+ }
+}
+
+void ExpressionInliner::visit(MemberAccess &memacc)
+{
+ visit(memacc.left);
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(Swizzle &swizzle)
+{
+ visit(swizzle.left);
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(UnaryExpression &unary)
+{
+ SetFlag set_target(mutating, mutating || unary.oper->token[1]=='+' || unary.oper->token[1]=='-');
+ visit(unary.expression);
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(BinaryExpression &binary)
+{
+ visit(binary.left);
+ {
+ SetFlag clear_target(mutating, false);
+ visit(binary.right);
+ }
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(Assignment &assign)
+{
+ {
+ SetFlag set_target(mutating);
+ visit(assign.left);