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::visit_and_record(RefPtr<Expression> &ptr)
{
r_ref_info = 0;
ptr->visit(*this);
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);
+ inline_expression(*r_ref_info->expression, ptr);
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)
+void ExpressionInliner::inline_expression(Expression &expr, RefPtr<Expression> &ptr)
{
- 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);
+ visit_and_record(expr);
}
void ExpressionInliner::visit(VariableReference &var)
void ExpressionInliner::visit(MemberAccess &memacc)
{
- visit_and_record(memacc.left, memacc.oper, false);
+ visit_and_record(memacc.left);
r_oper = memacc.oper;
r_trivial = false;
}
void ExpressionInliner::visit(Swizzle &swizzle)
{
- visit_and_record(swizzle.left, swizzle.oper, false);
+ visit_and_record(swizzle.left);
r_oper = swizzle.oper;
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);
+ visit_and_record(unary.expression);
r_oper = unary.oper;
r_trivial = false;
}
void ExpressionInliner::visit(BinaryExpression &binary)
{
- visit_and_record(binary.left, binary.oper, false);
+ visit_and_record(binary.left);
{
SetFlag clear_target(mutating, false);
- visit_and_record(binary.right, binary.oper, true);
+ visit_and_record(binary.right);
}
r_oper = binary.oper;
r_trivial = false;
{
{
SetFlag set_target(mutating);
- visit_and_record(assign.left, assign.oper, false);
+ visit_and_record(assign.left);
}
r_oper = 0;
- visit_and_record(assign.right, assign.oper, true);
+ visit_and_record(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_trivial = false;
}
+void ExpressionInliner::visit(TernaryExpression &ternary)
+{
+ visit_and_record(ternary.condition);
+ visit_and_record(ternary.true_expr);
+ visit_and_record(ternary.false_expr);
+ r_oper = ternary.oper;
+ r_trivial = false;
+}
+
void ExpressionInliner::visit(FunctionCall &call)
{
TraversingVisitor::visit(call);
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);
/* Treat function calls as having side effects so expression statements
consisting of nothing but a function call won't be optimized away. */
r_side_effects = true;
+
+ if(stage->type==Stage::GEOMETRY && call.name=="EmitVertex")
+ {
+ for(map<Statement *, VariableInfo>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+ if(i->second.output)
+ referenced(i->first, call);
+ }
}
void UnusedVariableRemover::record_assignment(const Assignment::Target &target, Node &node)
}
}
-void UnusedVariableRemover::visit(FunctionDeclaration &func)
-{
- if(func.body.body.empty())
- return;
-
- BlockVariableMap saved_vars = variables;
- // Assignments from other functions should not be visible.
- for(BlockVariableMap::iterator i=variables.begin(); i!=variables.end(); ++i)
- i->second.assignments.resize(i->second.initialized);
- TraversingVisitor::visit(func);
- swap(variables, saved_vars);
- merge_variables(saved_vars);
-
- /* Always treat function parameters as referenced. Removing unused
- parameters is not currently supported. */
- for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
- {
- BlockVariableMap::iterator j = variables.find(i->get());
- if(j!=variables.end())
- j->second.referenced = true;
- }
-}
-
void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
{
for(BlockVariableMap::const_iterator i=other_vars.begin(); i!=other_vars.end(); ++i)
}
}
+void UnusedVariableRemover::visit(FunctionDeclaration &func)
+{
+ if(func.body.body.empty())
+ return;
+
+ BlockVariableMap saved_vars = variables;
+ // Assignments from other functions should not be visible.
+ for(BlockVariableMap::iterator i=variables.begin(); i!=variables.end(); ++i)
+ i->second.assignments.resize(i->second.initialized);
+ TraversingVisitor::visit(func);
+ swap(variables, saved_vars);
+ merge_variables(saved_vars);
+
+ /* Always treat function parameters as referenced. Removing unused
+ parameters is not currently supported. */
+ for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ {
+ BlockVariableMap::iterator j = variables.find(i->get());
+ if(j!=variables.end())
+ j->second.referenced = true;
+ }
+}
+
void UnusedVariableRemover::visit(Conditional &cond)
{
cond.condition->visit(*this);
projects / libs / gl.git / blobdiff