class ConstantSpecializer: private TraversingVisitor
{
private:
- const std::map<std::string, int> *values;
+ const std::map<std::string, int> *values = 0;
public:
- ConstantSpecializer();
-
void apply(Stage &, const std::map<std::string, int> &);
private:
private:
std::map<FunctionDeclaration *, unsigned> refcounts;
std::set<FunctionDeclaration *> inlineable;
- FunctionDeclaration *current_function;
- unsigned return_count;
+ FunctionDeclaration *current_function = 0;
+ unsigned return_count = 0;
public:
- InlineableFunctionLocator();
-
std::set<FunctionDeclaration *> apply(Stage &s) { s.content.visit(*this); return inlineable; }
private:
RENAME
};
- FunctionDeclaration *source_func;
+ FunctionDeclaration *source_func = 0;
Block staging_block;
- Pass pass;
+ Pass pass = REFERENCED;
RefPtr<Statement> r_inlined_statement;
std::set<Node *> dependencies;
std::set<std::string> referenced_names;
std::string r_result_name;
public:
- InlineContentInjector();
-
std::string apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionCall &);
private:
class FunctionInliner: private TraversingVisitor
{
private:
- Stage *stage;
+ Stage *stage = 0;
std::set<FunctionDeclaration *> inlineable;
- FunctionDeclaration *current_function;
+ FunctionDeclaration *current_function = 0;
NodeList<Statement>::iterator insert_point;
RefPtr<Expression> r_inline_result;
- bool r_any_inlined;
- bool r_inlined_here;
+ bool r_any_inlined = false;
+ bool r_inlined_here = false;
public:
- FunctionInliner();
-
bool apply(Stage &);
private:
class ExpressionInliner: private TraversingVisitor
{
private:
- struct ExpressionInfo
+ struct ExpressionUse
{
- Expression *expression;
- Block *assign_scope;
- RefPtr<Expression> *inline_point;
- bool trivial;
- bool available;
+ RefPtr<Expression> *reference = 0;
+ Block *ref_scope = 0;
+ bool blocked = false;
+ };
- ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
+ struct ExpressionInfo
+ {
+ Assignment::Target target;
+ RefPtr<Expression> expression;
+ Block *assign_scope = 0;
+ std::vector<ExpressionUse> uses;
+ bool trivial = false;
};
- std::map<Assignment::Target, 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;
+ std::list<ExpressionInfo> expressions;
+ std::map<Assignment::Target, ExpressionInfo *> assignments;
+ ExpressionInfo *r_ref_info = 0;
+ bool r_trivial = false;
+ bool access_read = true;
+ bool access_write = false;
+ bool iteration_init = false;
+ Block *iteration_body = 0;
+ const Operator *r_oper = 0;
public:
- ExpressionInliner();
-
bool apply(Stage &);
private:
- void inline_expression(Expression &, RefPtr<Expression> &);
- virtual void visit(Block &);
virtual void visit(RefPtr<Expression> &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
class ConstantFolder: private TraversingVisitor
{
private:
- VariableDeclaration *iteration_var;
+ VariableDeclaration *iteration_var = 0;
Variant iter_init_value;
Variant r_constant_value;
- bool iteration_init;
- bool r_constant;
- bool r_literal;
- bool r_uses_iter_var;
- bool r_any_folded;
+ bool iteration_init = false;
+ bool r_constant = false;
+ bool r_literal = false;
+ bool r_uses_iter_var = false;
+ bool r_any_folded = false;
public:
bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; }
private:
- static BasicTypeDeclaration::Kind get_value_kind(const Variant &);
template<typename T>
static T evaluate_logical(char, T, T);
template<typename T>
static bool evaluate_relation(const char *, T, T);
template<typename T>
static T evaluate_arithmetic(char, T, T);
+ template<typename T>
+ static T evaluate_int_special_op(char, T, T);
+ template<typename T>
+ void convert_to_result(const Variant &);
void set_result(const Variant &, bool = false);
virtual void visit(RefPtr<Expression> &);
};
/** Removes conditional statements and loops where the condition can be
-determined as constant at compile time. */
+determined as constant at compile time. Also removes such statements where
+the body is empty and the condition has no side effects. */
class ConstantConditionEliminator: private TraversingVisitor
{
private:
NodeList<Statement>::iterator insert_point;
std::set<Node *> nodes_to_remove;
RefPtr<Expression> r_ternary_result;
+ bool r_external_side_effects = false;
public:
void apply(Stage &);
virtual void visit(Block &);
virtual void visit(RefPtr<Expression> &);
+ virtual void visit(UnaryExpression &);
+ virtual void visit(Assignment &);
virtual void visit(TernaryExpression &);
+ virtual void visit(FunctionCall &);
virtual void visit(Conditional &);
virtual void visit(Iteration &);
};
+class UnreachableCodeRemover: private TraversingVisitor
+{
+private:
+ bool reachable = true;
+ std::set<Node *> unreachable_nodes;
+
+public:
+ virtual bool apply(Stage &);
+
+private:
+ virtual void visit(Block &);
+ virtual void visit(FunctionDeclaration &);
+ virtual void visit(Conditional &);
+ virtual void visit(Iteration &);
+ virtual void visit(Return &) { reachable = false; }
+ virtual void visit(Jump &) { reachable = false; }
+};
+
/** Removes types which are not used anywhere. */
class UnusedTypeRemover: private TraversingVisitor
{
private:
struct AssignmentInfo
{
- Node *node;
+ Node *node = 0;
Assignment::Target target;
std::vector<Node *> used_by;
-
- AssignmentInfo(): node(0) { }
+ unsigned in_loop = 0;
};
struct VariableInfo
{
- InterfaceBlock *interface_block;
+ InterfaceBlock *interface_block = 0;
std::vector<AssignmentInfo *> assignments;
- bool initialized;
- bool output;
- bool referenced;
-
- VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
+ bool initialized = false;
+ bool output = false;
+ bool referenced = false;
};
typedef std::map<Statement *, VariableInfo> BlockVariableMap;
- Stage *stage;
+ Stage *stage = 0;
BlockVariableMap variables;
std::list<AssignmentInfo> assignments;
- InterfaceBlock *interface_block;
- Assignment *r_assignment;
- bool assignment_target;
- bool r_side_effects;
- bool composite_reference;
+ InterfaceBlock *interface_block = 0;
+ Assignment *r_assignment = 0;
+ bool assignment_target = false;
+ bool r_side_effects = false;
+ bool in_struct = false;
+ bool composite_reference = false;
+ unsigned in_loop = 0;
+ std::vector<Node *> loop_ext_refs;
Assignment::Target r_reference;
std::set<Node *> unused_nodes;
public:
- UnusedVariableRemover();
-
bool apply(Stage &);
private:
virtual void visit(FunctionCall &);
void record_assignment(const Assignment::Target &, Node &);
virtual void visit(ExpressionStatement &);
- // Ignore structs because their members can't be accessed directly.
- virtual void visit(StructDeclaration &) { }
+ virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &);
void merge_variables(const BlockVariableMap &);
projects / libs / gl.git / blobdiff