From: bdemsky <bdemsky@uci.edu>
Date: Tue, 5 Sep 2017 06:17:14 +0000 (-0700)
Subject: Revert patch to hide symptom of previous bugs
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=bf9fa0d935c29ba46f45dff89fe3ef19f73c9779

Revert patch to hide symptom of previous bugs
---

diff --git a/src/AST/order.h b/src/AST/order.h
index d922235..cc8b45e 100644
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -19,7 +19,7 @@ public:
 	Order *clone(CSolver *solver, CloneMap *map);
 	Vector<BooleanOrder *> constraints;
 	OrderEncoding encoding;
-	void setOrderResolver(OrderResolver *_resolver) { encoding.resolver = _resolver;};
+	void setOrderResolver(OrderResolver *_resolver) { ASSERT(encoding.resolver == NULL); encoding.resolver = _resolver;};
 	void initializeOrderHashtable();
 	void initializeOrderElementsHashtable();
 	void addOrderConstraint(BooleanOrder *constraint);
diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index 1bc1dc3..25ef990 100644
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@ -20,8 +20,7 @@ void IntegerEncodingTransform::doTransform() {
 	SetIteratorOrder * orderit=orders->iterator();
 	while(orderit->hasNext()) {
 		Order *order = orderit->next();
-		if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &onoff) &&
-			order->encoding.resolver == NULL)
+		if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &onoff))
 			integerEncode(order);
 	}
 	delete orders;