}
-FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
- inlineable(in),
+FunctionInliner::FunctionInliner():
extract_result(0)
{ }
+void FunctionInliner::apply(Stage &stage)
+{
+ inlineable = InlineableFunctionLocator().apply(stage);
+ stage.content.visit(*this);
+}
+
void FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
{
inline_result = 0;
ConstantConditionEliminator::ConstantConditionEliminator():
- scope_level(0),
record_only(false)
{ }
+void ConstantConditionEliminator::apply(Stage &stage)
+{
+ stage.content.visit(*this);
+ NodeRemover().apply(stage, nodes_to_remove);
+}
+
void ConstantConditionEliminator::visit(Block &block)
{
- SetForScope<unsigned> set(scope_level, scope_level+1);
- BlockModifier::visit(block);
+ SetForScope<Block *> set_block(current_block, &block);
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ {
+ insert_point = i;
+ (*i)->visit(*this);
+ }
for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
variable_values.erase(i->second);
void ConstantConditionEliminator::visit(VariableDeclaration &var)
{
- if(var.constant || scope_level>1)
+ if(var.constant || current_block->parent)
variable_values[&var] = var.init_expression.get();
}
cond.condition->visit(eval);
if(eval.is_result_valid())
{
- flatten_block(eval.get_result() ? cond.body : cond.else_body);
+ Block &block = (eval.get_result() ? cond.body : cond.else_body);
+ current_block->body.splice(insert_point, block.body);
+ nodes_to_remove.insert(&cond);
return;
}
}
iter.condition->visit(eval);
if(eval.is_result_valid() && !eval.get_result())
{
- remove_node = true;
+ nodes_to_remove.insert(&iter);
return;
}
}
}
-UnusedVariableLocator::VariableInfo::VariableInfo():
+UnusedVariableRemover::VariableInfo::VariableInfo():
local(false),
conditionally_assigned(false),
referenced(false)
{ }
-UnusedVariableLocator::UnusedVariableLocator():
+UnusedVariableRemover::UnusedVariableRemover():
aggregate(0),
assignment(0),
assignment_target(false),
- assign_to_subscript(false),
- global_scope(true)
+ assign_to_subscript(false)
{ }
-const set<Node *> &UnusedVariableRemover::apply(Stage &stage)
+bool UnusedVariableRemover::apply(Stage &stage)
{
variables.push_back(BlockVariableMap());
- visit(stage.content);
+ stage.content.visit(*this);
BlockVariableMap &global_variables = variables.back();
for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
{
}
variables.pop_back();
- return unused_nodes;
+ NodeRemover().apply(stage, unused_nodes);
+
+ return !unused_nodes.empty();
}
-void UnusedVariableLocator::visit(VariableReference &var)
+void UnusedVariableRemover::visit(VariableReference &var)
{
map<VariableDeclaration *, Node *>::iterator i = aggregates.find(var.declaration);
if(i!=aggregates.end())
}
}
-void UnusedVariableLocator::visit(MemberAccess &memacc)
+void UnusedVariableRemover::visit(MemberAccess &memacc)
{
TraversingVisitor::visit(memacc);
unused_nodes.erase(memacc.declaration);
}
-void UnusedVariableLocator::visit(BinaryExpression &binary)
+void UnusedVariableRemover::visit(BinaryExpression &binary)
{
if(binary.oper=="[")
{
TraversingVisitor::visit(binary);
}
-void UnusedVariableLocator::visit(Assignment &assign)
+void UnusedVariableRemover::visit(Assignment &assign)
{
{
assign_to_subscript = false;
assignment = &assign;
}
-void UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool chained)
+void UnusedVariableRemover::record_assignment(VariableDeclaration &var, Node &node, bool chained)
{
VariableInfo &var_info = variables.back()[&var];
if(!chained)
var_info.conditionally_assigned = false;
}
-void UnusedVariableLocator::clear_assignments(VariableInfo &var_info, bool mark_unused)
+void UnusedVariableRemover::clear_assignments(VariableInfo &var_info, bool mark_unused)
{
if(mark_unused)
{
var_info.assignments.clear();
}
-void UnusedVariableLocator::visit(ExpressionStatement &expr)
+void UnusedVariableRemover::visit(ExpressionStatement &expr)
{
assignment = 0;
TraversingVisitor::visit(expr);
record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript));
}
-void UnusedVariableLocator::visit(StructDeclaration &strct)
+void UnusedVariableRemover::visit(StructDeclaration &strct)
{
SetForScope<Node *> set(aggregate, &strct);
unused_nodes.insert(&strct);
TraversingVisitor::visit(strct);
}
-void UnusedVariableLocator::visit(VariableDeclaration &var)
+void UnusedVariableRemover::visit(VariableDeclaration &var)
{
if(aggregate)
aggregates[&var] = aggregate;
TraversingVisitor::visit(var);
}
-void UnusedVariableLocator::visit(InterfaceBlock &iface)
+void UnusedVariableRemover::visit(InterfaceBlock &iface)
{
SetForScope<Node *> set(aggregate, &iface);
unused_nodes.insert(&iface);
TraversingVisitor::visit(iface);
}
-void UnusedVariableLocator::visit(FunctionDeclaration &func)
+void UnusedVariableRemover::visit(FunctionDeclaration &func)
{
variables.push_back(BlockVariableMap());
- {
- SetForScope<bool> set(global_scope, false);
- for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
- (*i)->visit(*this);
- func.body.visit(*this);
- }
+ for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ (*i)->visit(*this);
+ func.body.visit(*this);
BlockVariableMap &block_variables = variables.back();
for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
merge_down_variables();
}
-void UnusedVariableLocator::merge_down_variables()
+void UnusedVariableRemover::merge_down_variables()
{
BlockVariableMap &parent_variables = variables[variables.size()-2];
BlockVariableMap &block_variables = variables.back();
variables.pop_back();
}
-void UnusedVariableLocator::visit(Conditional &cond)
+void UnusedVariableRemover::visit(Conditional &cond)
{
cond.condition->visit(*this);
variables.push_back(BlockVariableMap());
merge_down_variables();
}
-void UnusedVariableLocator::visit(Iteration &iter)
+void UnusedVariableRemover::visit(Iteration &iter)
{
variables.push_back(BlockVariableMap());
TraversingVisitor::visit(iter);
}
-void UnusedFunctionLocator::visit(FunctionCall &call)
+bool UnusedFunctionRemover::apply(Stage &stage)
+{
+ stage.content.visit(*this);
+ NodeRemover().apply(stage, unused_nodes);
+ return !unused_nodes.empty();
+}
+
+void UnusedFunctionRemover::visit(FunctionCall &call)
{
TraversingVisitor::visit(call);
used_definitions.insert(call.declaration->definition);
}
-void UnusedFunctionLocator::visit(FunctionDeclaration &func)
+void UnusedFunctionRemover::visit(FunctionDeclaration &func)
{
TraversingVisitor::visit(func);