From bf9fa0d935c29ba46f45dff89fe3ef19f73c9779 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Mon, 4 Sep 2017 23:17:14 -0700 Subject: [PATCH] Revert patch to hide symptom of previous bugs --- src/AST/order.h | 2 +- src/ASTTransform/integerencoding.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 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; -- 2.34.1