Remove recursive call to simplify with reversed arguments.

(We now have explicit rules for that).

2 files changed, 2 insertions, 10 deletions

diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
index 58c254b1..3825f5ed 100644
--- a/libevmasm/ExpressionClasses.cpp
+++ b/libevmasm/ExpressionClasses.cpp
@@ -181,7 +181,7 @@ string ExpressionClasses::fullDAGToString(ExpressionClasses::Id _id) const
 	return str.str();
 }
 
-ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr, bool _secondRun)
+ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr)
 {
 	static Rules rules;
 
@@ -205,13 +205,6 @@ ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr,
 		return rebuildExpression(ExpressionTemplate(std::get<1>(*match)(), _expr.item->location()));
 	}
 
-	if (!_secondRun && _expr.arguments.size() == 2 && SemanticInformation::isCommutativeOperation(*_expr.item))
-	{
-		Expression expr = _expr;
-		swap(expr.arguments[0], expr.arguments[1]);
-		return tryToSimplify(expr, true);
-	}
-
 	return -1;
 }
 
diff --git a/libevmasm/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
index 6b426e97..df8082f9 100644
--- a/libevmasm/ExpressionClasses.h
+++ b/libevmasm/ExpressionClasses.h
@@ -108,8 +108,7 @@ public:
 private:
 	/// Tries to simplify the given expression.
 	/// @returns its class if it possible or Id(-1) otherwise.
-	/// @param _secondRun is set to true for the second run where arguments of commutative expressions are reversed
-	Id tryToSimplify(Expression const& _expr, bool _secondRun = false);
+	Id tryToSimplify(Expression const& _expr);
 
 	/// Rebuilds an expression from a (matched) pattern.
 	Id rebuildExpression(ExpressionTemplate const& _template);