bool apply(Stage &);
private:
- void visit_and_inline(RefPtr<Expression> &);
-
+ virtual void visit(RefPtr<Expression> &);
virtual void visit(Block &);
- virtual void visit(UnaryExpression &);
- virtual void visit(BinaryExpression &);
- virtual void visit(MemberAccess &);
virtual void visit(FunctionCall &);
- virtual void visit(ExpressionStatement &);
- virtual void visit(VariableDeclaration &);
virtual void visit(FunctionDeclaration &);
- virtual void visit(Conditional &);
virtual void visit(Iteration &);
- virtual void visit(Return &);
};
/** Inlines variables into expressions. Variables with trivial values (those
ExpressionInfo();
};
- std::map<VariableDeclaration *, ExpressionInfo> expressions;
+ std::map<Assignment::Target, ExpressionInfo> expressions;
ExpressionInfo *r_ref_info;
bool r_any_inlined;
bool r_trivial;
void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
virtual void visit(Block &);
+ virtual void visit(RefPtr<Expression> &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
+ virtual void visit(Swizzle &);
virtual void visit(UnaryExpression &);
virtual void visit(BinaryExpression &);
virtual void visit(Assignment &);
virtual void visit(FunctionCall &);
virtual void visit(VariableDeclaration &);
- virtual void visit(Conditional &);
virtual void visit(Iteration &);
- virtual void visit(Return &);
};
/** Removes conditional statements and loops where the condition can be
virtual void visit(ImageTypeDeclaration &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
+ virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
};
class UnusedVariableRemover: private TraversingVisitor
{
private:
+ struct AssignmentInfo
+ {
+ Node *node;
+ Assignment::Target target;
+ std::vector<Node *> used_by;
+
+ AssignmentInfo(): node(0) { }
+ };
+
struct VariableInfo
{
- bool local;
- std::vector<Node *> assignments;
- bool conditionally_assigned;
+ InterfaceBlock *interface_block;
+ std::vector<AssignmentInfo *> assignments;
+ bool initialized;
+ bool output;
bool referenced;
- VariableInfo();
+ VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
};
- typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+ typedef std::map<Statement *, VariableInfo> BlockVariableMap;
- std::set<Node *> unused_nodes;
- std::map<VariableDeclaration *, Node *> aggregates;
- Node *aggregate;
- std::vector<BlockVariableMap> variables;
+ Stage *stage;
+ BlockVariableMap variables;
+ std::list<AssignmentInfo> assignments;
+ InterfaceBlock *interface_block;
Assignment *r_assignment;
bool assignment_target;
- bool r_assign_to_subfield;
bool r_side_effects;
+ std::set<Node *> unused_nodes;
public:
UnusedVariableRemover();
bool apply(Stage &);
private:
+ void referenced(const Assignment::Target &, Node &);
virtual void visit(VariableReference &);
virtual void visit(InterfaceBlockReference &);
- virtual void visit(MemberAccess &);
virtual void visit(UnaryExpression &);
virtual void visit(BinaryExpression &);
virtual void visit(Assignment &);
- void record_assignment(VariableDeclaration &, Node &, bool);
- void clear_assignments(VariableInfo &, bool);
virtual void visit(FunctionCall &);
+ void record_assignment(const Assignment::Target &, Node &);
virtual void visit(ExpressionStatement &);
- virtual void visit(StructDeclaration &);
+ // Ignore structs because their members can't be accessed directly.
+ virtual void visit(StructDeclaration &) { }
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &);
+ void merge_variables(const BlockVariableMap &);
virtual void visit(FunctionDeclaration &);
- void merge_down_variables();
virtual void visit(Conditional &);
virtual void visit(Iteration &);
};