std::map<std::string, VariableDeclaration *> variable_map;
bool remap_names;
bool deps_only;
- RefPtr<Statement> inlined_statement;
+ RefPtr<Statement> r_inlined_statement;
std::set<Node *> dependencies;
- std::string result_name;
+ std::string r_result_name;
public:
InlineContentInjector();
std::set<FunctionDeclaration *> inlineable;
FunctionDeclaration *current_function;
NodeList<Statement>::iterator insert_point;
- RefPtr<Expression> inline_result;
- bool any_inlined;
+ RefPtr<Expression> r_inline_result;
+ bool r_any_inlined;
public:
FunctionInliner();
virtual void visit(Return &);
};
+/** Inlines variables into expressions. Variables with trivial values (those
+consisting of a single literal or variable reference) are always inlined.
+Variables which are only referenced once are also inlined. */
+class ExpressionInliner: private TraversingVisitor
+{
+private:
+ struct ExpressionInfo
+ {
+ Expression *expression;
+ Block *assign_scope;
+ RefPtr<Expression> *inline_point;
+ const Operator *inner_oper;
+ const Operator *outer_oper;
+ bool inline_on_rhs;
+ bool trivial;
+ bool available;
+
+ ExpressionInfo();
+ };
+
+ std::map<VariableDeclaration *, ExpressionInfo> expressions;
+ ExpressionInfo *r_ref_info;
+ bool r_any_inlined;
+ bool r_trivial;
+ bool mutating;
+ bool iteration_init;
+ Block *iteration_body;
+ const Operator *r_oper;
+
+public:
+ ExpressionInliner();
+
+ bool apply(Stage &);
+
+private:
+ 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(VariableReference &);
+ virtual void visit(MemberAccess &);
+ 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
determined as constant at compile time. */
class ConstantConditionEliminator: private TraversingVisitor
{
private:
- bool record_only;
- ExpressionEvaluator::ValueMap variable_values;
NodeList<Statement>::iterator insert_point;
std::set<Node *> nodes_to_remove;
public:
- ConstantConditionEliminator();
-
void apply(Stage &);
private:
virtual void visit(Block &);
- virtual void visit(UnaryExpression &);
- virtual void visit(Assignment &);
- virtual void visit(VariableDeclaration &);
virtual void visit(Conditional &);
virtual void visit(Iteration &);
};
+/** Removes types which are not used anywhere. */
+class UnusedTypeRemover: private TraversingVisitor
+{
+private:
+ std::set<Node *> unused_nodes;
+
+public:
+ bool apply(Stage &);
+
+private:
+ virtual void visit(Literal &);
+ virtual void visit(UnaryExpression &);
+ virtual void visit(BinaryExpression &);
+ virtual void visit(FunctionCall &);
+ virtual void visit(BasicTypeDeclaration &);
+ virtual void visit(ImageTypeDeclaration &);
+ virtual void visit(StructDeclaration &);
+ virtual void visit(VariableDeclaration &);
+ virtual void visit(FunctionDeclaration &);
+};
+
/** Removes variable declarations with no references to them. Assignment
statements where the result is not used are also removed. */
class UnusedVariableRemover: private TraversingVisitor
std::map<VariableDeclaration *, Node *> aggregates;
Node *aggregate;
std::vector<BlockVariableMap> variables;
- Assignment *assignment;
+ Assignment *r_assignment;
bool assignment_target;
- bool assign_to_subscript;
- bool side_effects;
+ bool r_assign_to_subfield;
+ bool r_side_effects;
public:
UnusedVariableRemover();