diff --git a/src/ExprNode.cc b/src/ExprNode.cc index 3432f2cc..a0fc3922 100644 --- a/src/ExprNode.cc +++ b/src/ExprNode.cc @@ -5469,10 +5469,13 @@ BinaryOpNode::findConstantEquations(map &table) { if (op_code == BinaryOpcode::equal) { - if (dynamic_cast(arg1) && dynamic_cast(arg2)) - table[dynamic_cast(arg1)] = dynamic_cast(arg2); - else if (dynamic_cast(arg2) && dynamic_cast(arg1)) - table[dynamic_cast(arg2)] = dynamic_cast(arg1); + // The variable must be contemporaneous (see #83) + if (auto varg1 = dynamic_cast(arg1); + varg1 && varg1->lag == 0 && dynamic_cast(arg2)) + table[varg1] = dynamic_cast(arg2); + else if (auto varg2 = dynamic_cast(arg2); + varg2 && varg2->lag == 0 && dynamic_cast(arg1)) + table[varg2] = dynamic_cast(arg1); } }