{
target_block = &tgt_blk;
source_func = &src;
+ remap_prefix = source_func->name;
+
+ vector<RefPtr<Statement> > inlined;
+ inlined.reserve(src.body.body.size());
for(NodeList<Statement>::iterator i=src.body.body.begin(); i!=src.body.body.end(); ++i)
{
r_inlined_statement = 0;
if(!r_inlined_statement)
r_inlined_statement = (*i)->clone();
- SetFlag set_remap(remap_names);
+ SetForScope<unsigned> set_remap(remap_names, 2);
r_inlined_statement->visit(*this);
- tgt_blk.body.insert(ins_pt, r_inlined_statement);
+ inlined.push_back(r_inlined_statement);
}
+ SetForScope<unsigned> set_remap(remap_names, 1);
+ SetForScope<string> set_prefix(remap_prefix, target_func.name);
+ variable_map.clear();
+ target_func.visit(*this);
+
+ tgt_blk.body.insert(ins_pt, inlined.begin(), inlined.end());
+
NodeReorderer().apply(stage, target_func, dependencies);
return r_result_name;
}
-string InlineContentInjector::create_unused_name(const string &base, bool always_prefix)
-{
- string result = base;
- if(always_prefix || target_block->variables.count(result))
- result = format("_%s_%s", source_func->name, base);
- unsigned initial_size = result.size();
- for(unsigned i=1; target_block->variables.count(result); ++i)
- {
- result.erase(initial_size);
- result += format("_%d", i);
- }
- return result;
-}
-
void InlineContentInjector::visit(VariableReference &var)
{
if(remap_names)
else if(var.declaration)
{
SetFlag set_deps(deps_only);
- dependencies.insert(var.declaration);
+ if(!variable_map.count(var.name))
+ {
+ dependencies.insert(var.declaration);
+ referenced_names.insert(var.name);
+ }
var.declaration->visit(*this);
}
}
{
SetFlag set_deps(deps_only);
dependencies.insert(iface.declaration);
+ referenced_names.insert(iface.name);
iface.declaration->visit(*this);
}
}
void InlineContentInjector::visit(FunctionCall &call)
{
if(!remap_names && call.declaration)
+ {
dependencies.insert(call.declaration);
+ referenced_names.insert(call.name);
+ }
TraversingVisitor::visit(call);
}
{
TraversingVisitor::visit(var);
- if(var.type_declaration)
+ if(remap_names)
+ {
+ if(remap_names==2 || referenced_names.count(var.name))
+ {
+ string mapped_name = get_unused_variable_name(*target_block, var.name, remap_prefix);
+ variable_map[var.name] = &var;
+ var.name = mapped_name;
+ }
+ }
+ else if(var.type_declaration)
{
SetFlag set_deps(deps_only);
dependencies.insert(var.type_declaration);
+ referenced_names.insert(var.type_declaration->name);
var.type_declaration->visit(*this);
}
-
- if(!remap_names && !deps_only)
- {
- RefPtr<VariableDeclaration> inlined_var = var.clone();
- inlined_var->name = create_unused_name(var.name, false);
- r_inlined_statement = inlined_var;
-
- variable_map[var.name] = inlined_var.get();
- }
}
void InlineContentInjector::visit(Return &ret)
{
TraversingVisitor::visit(ret);
- if(ret.expression)
+ if(!remap_names && ret.expression)
{
/* Create a new variable to hold the return value of the inlined
function. */
- r_result_name = create_unused_name("return", true);
+ r_result_name = get_unused_variable_name(*target_block, "_return", source_func->name);
RefPtr<VariableDeclaration> var = new VariableDeclaration;
var->source = ret.source;
var->line = ret.line;
expression(0),
assign_scope(0),
inline_point(0),
- inner_oper(0),
- outer_oper(0),
- inline_on_rhs(false),
trivial(false),
available(true)
{ }
return r_any_inlined;
}
-void ExpressionInliner::visit_and_record(RefPtr<Expression> &ptr, const Operator *outer_oper, bool on_rhs)
+void ExpressionInliner::inline_expression(Expression &expr, RefPtr<Expression> &ptr)
{
- r_ref_info = 0;
- ptr->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;
- }
-
- r_ref_info->outer_oper = outer_oper;
- if(r_ref_info->trivial)
- inline_expression(*r_ref_info->expression, ptr, outer_oper, r_ref_info->inner_oper, on_rhs);
- 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 = &ptr;
- r_ref_info->inline_on_rhs = on_rhs;
- }
- }
- r_ref_info = 0;
-}
-
-void ExpressionInliner::inline_expression(Expression &expr, RefPtr<Expression> &ptr, const Operator *outer_oper, const Operator *inner_oper, bool on_rhs)
-{
- unsigned outer_precedence = (outer_oper ? outer_oper->precedence : 20);
- unsigned inner_precedence = (inner_oper ? inner_oper->precedence : 0);
-
- bool needs_parentheses = (inner_precedence>=outer_precedence);
- if(inner_oper && inner_oper==outer_oper)
- // Omit parentheses if the operator's natural grouping works out.
- needs_parentheses = (inner_oper->assoc!=Operator::ASSOCIATIVE && on_rhs!=(inner_oper->assoc==Operator::RIGHT_TO_LEFT));
-
- if(needs_parentheses)
- {
- RefPtr<ParenthesizedExpression> parexpr = new ParenthesizedExpression;
- parexpr->expression = expr.clone();
- ptr = parexpr;
- }
- else
- ptr = expr.clone();
-
+ ptr = expr.clone();
r_any_inlined = true;
}
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, j->second.outer_oper, j->second.inner_oper, j->second.inline_on_rhs);
+ inline_expression(*j->second.expression, *j->second.inline_point);
expressions.erase(j++);
}
void ExpressionInliner::visit(RefPtr<Expression> &expr)
{
- visit_and_record(expr, 0, false);
+ 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)
void ExpressionInliner::visit(MemberAccess &memacc)
{
- visit_and_record(memacc.left, memacc.oper, false);
- r_oper = memacc.oper;
+ visit(memacc.left);
r_trivial = false;
}
void ExpressionInliner::visit(Swizzle &swizzle)
{
- visit_and_record(swizzle.left, swizzle.oper, false);
- r_oper = swizzle.oper;
+ 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_and_record(unary.expression, unary.oper, false);
- r_oper = unary.oper;
+ visit(unary.expression);
r_trivial = false;
}
void ExpressionInliner::visit(BinaryExpression &binary)
{
- visit_and_record(binary.left, binary.oper, false);
+ visit(binary.left);
{
SetFlag clear_target(mutating, false);
- visit_and_record(binary.right, binary.oper, true);
+ visit(binary.right);
}
- r_oper = binary.oper;
r_trivial = false;
}
{
{
SetFlag set_target(mutating);
- visit_and_record(assign.left, assign.oper, false);
+ visit(assign.left);
}
r_oper = 0;
- visit_and_record(assign.right, assign.oper, true);
+ visit(assign.right);
map<Assignment::Target, ExpressionInfo>::iterator i = expressions.find(assign.target);
if(i!=expressions.end())
i->second.expression = (assign.self_referencing ? 0 : assign.right.get());
i->second.assign_scope = current_block;
i->second.inline_point = 0;
- i->second.inner_oper = r_oper;
i->second.available = true;
}
- r_oper = assign.oper;
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(TernaryExpression &ternary)
+{
+ visit(ternary.condition);
+ visit(ternary.true_expr);
+ visit(ternary.false_expr);
r_trivial = false;
}
void ExpressionInliner::visit(FunctionCall &call)
{
TraversingVisitor::visit(call);
- r_oper = 0;
r_trivial = false;
}
will have their values change throughout the iteration. */
info.expression = (iteration_init ? 0 : var.init_expression.get());
info.assign_scope = current_block;
- info.inner_oper = r_oper;
info.trivial = r_trivial;
}
}
TraversingVisitor::visit(binary);
}
+void UnusedTypeRemover::visit(TernaryExpression &ternary)
+{
+ unused_nodes.erase(ternary.type);
+ TraversingVisitor::visit(ternary);
+}
+
void UnusedTypeRemover::visit(FunctionCall &call)
{
unused_nodes.erase(call.type);
projects / libs / gl.git / blobdiff