#include <msp/core/raii.h>
#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
#include "optimize.h"
#include "reflect.h"
++count;
/* Don't inline functions which are called more than once or are called
recursively. */
- if(count>1 || def==current_function)
+ if((count>1 && def->source!=BUILTIN_SOURCE) || def==current_function)
inlineable.erase(def);
}
has_out_params = ((*i)->interface=="out");
unsigned &count = refcounts[func.definition];
- if(count<=1 && !has_out_params)
+ if((count<=1 || func.source==BUILTIN_SOURCE) && !has_out_params)
inlineable.insert(func.definition);
SetForScope<FunctionDeclaration *> set(current_function, &func);
staging_block.parent = &tgt_blk;
staging_block.variables.clear();
- std::vector<RefPtr<VariableDeclaration> > params;
+ vector<RefPtr<VariableDeclaration> > params;
params.reserve(source_func->parameters.size());
for(NodeArray<VariableDeclaration>::iterator i=source_func->parameters.begin(); i!=source_func->parameters.end(); ++i)
{
}
-BasicTypeDeclaration::Kind ConstantFolder::get_value_kind(const Variant &value)
-{
- if(value.check_type<bool>())
- return BasicTypeDeclaration::BOOL;
- else if(value.check_type<int>())
- return BasicTypeDeclaration::INT;
- else if(value.check_type<float>())
- return BasicTypeDeclaration::FLOAT;
- else
- return BasicTypeDeclaration::VOID;
-}
-
template<typename T>
T ConstantFolder::evaluate_logical(char oper, T left, T right)
{
if(!r_constant || r_literal || r_uses_iter_var)
return;
- BasicTypeDeclaration::Kind kind = get_value_kind(r_constant_value);
- if(kind==BasicTypeDeclaration::VOID)
- {
- r_constant = false;
- return;
- }
-
RefPtr<Literal> literal = new Literal;
- if(kind==BasicTypeDeclaration::BOOL)
+ if(r_constant_value.check_type<bool>())
literal->token = (r_constant_value.value<bool>() ? "true" : "false");
- else if(kind==BasicTypeDeclaration::INT)
+ else if(r_constant_value.check_type<int>())
literal->token = lexical_cast<string>(r_constant_value.value<int>());
- else if(kind==BasicTypeDeclaration::FLOAT)
+ else if(r_constant_value.check_type<float>())
+ {
literal->token = lexical_cast<string>(r_constant_value.value<float>());
+ if(isnumrc(literal->token))
+ literal->token += ".0";
+ }
+ else
+ {
+ r_constant = false;
+ return;
+ }
literal->value = r_constant_value;
expr = literal;
}
if(!can_fold)
return;
- BasicTypeDeclaration::Kind kind = get_value_kind(r_constant_value);
-
char oper = unary.oper->token[0];
char oper2 = unary.oper->token[1];
if(oper=='!')
{
- if(kind==BasicTypeDeclaration::BOOL)
+ if(r_constant_value.check_type<bool>())
set_result(!r_constant_value.value<bool>());
}
else if(oper=='~')
{
- if(kind==BasicTypeDeclaration::INT)
+ if(r_constant_value.check_type<int>())
set_result(~r_constant_value.value<int>());
+ else if(r_constant_value.check_type<unsigned>())
+ set_result(~r_constant_value.value<unsigned>());
}
else if(oper=='-' && !oper2)
{
- if(kind==BasicTypeDeclaration::INT)
+ if(r_constant_value.check_type<int>())
set_result(-r_constant_value.value<int>());
- else if(kind==BasicTypeDeclaration::FLOAT)
+ else if(r_constant_value.check_type<unsigned>())
+ set_result(-r_constant_value.value<unsigned>());
+ else if(r_constant_value.check_type<float>())
set_result(-r_constant_value.value<float>());
}
}
if(!can_fold)
return;
- BasicTypeDeclaration::Kind left_kind = get_value_kind(left_value);
- BasicTypeDeclaration::Kind right_kind = get_value_kind(r_constant_value);
// Currently only expressions with both sides of equal types are handled.
- if(left_kind!=right_kind)
+ if(!left_value.check_same_type(r_constant_value))
return;
char oper = binary.oper->token[0];
char oper2 = binary.oper->token[1];
if(oper=='&' || oper=='|' || oper=='^')
{
- if(oper2==oper && left_kind==BasicTypeDeclaration::BOOL)
+ if(oper2==oper && left_value.check_type<bool>())
set_result(evaluate_logical(oper, left_value.value<bool>(), r_constant_value.value<bool>()));
- else if(!oper2 && left_kind==BasicTypeDeclaration::INT)
+ else if(!oper2 && left_value.check_type<int>())
set_result(evaluate_logical(oper, left_value.value<int>(), r_constant_value.value<int>()));
}
else if((oper=='<' || oper=='>') && oper2!=oper)
{
- if(left_kind==BasicTypeDeclaration::INT)
+ if(left_value.check_type<int>())
set_result(evaluate_relation(binary.oper->token, left_value.value<int>(), r_constant_value.value<int>()));
- else if(left_kind==BasicTypeDeclaration::FLOAT)
+ else if(left_value.check_type<float>())
set_result(evaluate_relation(binary.oper->token, left_value.value<float>(), r_constant_value.value<float>()));
}
else if((oper=='=' || oper=='!') && oper2=='=')
{
- if(left_kind==BasicTypeDeclaration::INT)
+ if(left_value.check_type<int>())
set_result((left_value.value<int>()==r_constant_value.value<int>()) == (oper=='='));
- if(left_kind==BasicTypeDeclaration::FLOAT)
+ if(left_value.check_type<float>())
set_result((left_value.value<float>()==r_constant_value.value<float>()) == (oper=='='));
}
else if(oper=='+' || oper=='-' || oper=='*' || oper=='/')
{
- if(left_kind==BasicTypeDeclaration::INT)
+ if(left_value.check_type<int>())
set_result(evaluate_arithmetic(oper, left_value.value<int>(), r_constant_value.value<int>()));
- else if(left_kind==BasicTypeDeclaration::FLOAT)
+ else if(left_value.check_type<float>())
set_result(evaluate_arithmetic(oper, left_value.value<float>(), r_constant_value.value<float>()));
}
else if(oper=='%' || ((oper=='<' || oper=='>') && oper2==oper))
{
- if(left_kind!=BasicTypeDeclaration::INT)
+ if(!left_value.check_type<int>())
return;
if(oper=='%')
}
+UnreachableCodeRemover::UnreachableCodeRemover():
+ reachable(true)
+{ }
+
+bool UnreachableCodeRemover::apply(Stage &stage)
+{
+ stage.content.visit(*this);
+ NodeRemover().apply(stage, unreachable_nodes);
+ return !unreachable_nodes.empty();
+}
+
+void UnreachableCodeRemover::visit(Block &block)
+{
+ NodeList<Statement>::iterator i = block.body.begin();
+ for(; (reachable && i!=block.body.end()); ++i)
+ (*i)->visit(*this);
+ for(; i!=block.body.end(); ++i)
+ unreachable_nodes.insert(i->get());
+}
+
+void UnreachableCodeRemover::visit(FunctionDeclaration &func)
+{
+ TraversingVisitor::visit(func);
+ reachable = true;
+}
+
+void UnreachableCodeRemover::visit(Conditional &cond)
+{
+ cond.body.visit(*this);
+ bool reachable_if_true = reachable;
+ reachable = true;
+ cond.else_body.visit(*this);
+
+ reachable |= reachable_if_true;
+}
+
+void UnreachableCodeRemover::visit(Iteration &iter)
+{
+ TraversingVisitor::visit(iter);
+
+ /* Always consider code after a loop reachable, since there's no checking
+ for whether the loop executes. */
+ reachable = true;
+}
+
+
bool UnusedTypeRemover::apply(Stage &stage)
{
stage.content.visit(*this);
r_assignment(0),
assignment_target(false),
r_side_effects(false),
+ in_struct(false),
composite_reference(false)
{ }
unused_nodes.insert(&expr);
}
+void UnusedVariableRemover::visit(StructDeclaration &strct)
+{
+ SetFlag set_struct(in_struct);
+ TraversingVisitor::visit(strct);
+}
+
void UnusedVariableRemover::visit(VariableDeclaration &var)
{
+ TraversingVisitor::visit(var);
+
+ if(in_struct)
+ return;
+
VariableInfo &var_info = variables[&var];
var_info.interface_block = interface_block;
var_info.initialized = true;
record_assignment(&var, *var.init_expression);
}
- TraversingVisitor::visit(var);
}
void UnusedVariableRemover::visit(InterfaceBlock &iface)