Revert patch to hide symptom of previous bugs
authorbdemsky <bdemsky@uci.edu>
Tue, 5 Sep 2017 06:17:14 +0000 (23:17 -0700)
committerbdemsky <bdemsky@uci.edu>
Tue, 5 Sep 2017 06:17:14 +0000 (23:17 -0700)
src/AST/order.h
src/ASTTransform/integerencoding.cc

index d922235..cc8b45e 100644 (file)
@@ -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);
index 1bc1dc3..25ef990 100644 (file)
@@ -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;