From: bdemsky <bdemsky@uci.edu>
Date: Wed, 20 Sep 2017 21:01:14 +0000 (-0700)
Subject: Bug fixes
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=91c222d99149ed6f9792a227205fa58d44e0a773

Bug fixes
---

diff --git a/src/AST/iterator.cc b/src/AST/iterator.cc
index 2a18889..2b0dea4 100644
--- a/src/AST/iterator.cc
+++ b/src/AST/iterator.cc
@@ -72,7 +72,7 @@ ElementIterator::ElementIterator(CSolver *_solver) :
 	bit(_solver),
 	base(NULL),
 	baseindex(0) {
-	
+	updateNext();
 }
 
 ElementIterator::~ElementIterator() {
@@ -100,7 +100,8 @@ void ElementIterator::updateNext() {
 					if (discovered.add(e)) {
 						element.push(e);
 						index.push(0);
-					}
+					} else
+						continue;
 				}
 			} else {
 				if (bit.hasNext()) {
diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index 9231ad6..28255ec 100644
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -63,7 +63,8 @@ void EncodingGraph::encode() {
 			ElementEncoding *encoding=e->getElementEncoding();
 			if (encoding->getElementEncodingType() == ELEM_UNASSIGNED) {
 				EncodingNode *n = getNode(e);
-				ASSERT(n != NULL);
+				if (n == NULL)
+					continue;
 				ElementEncodingType encodetype=n->getEncoding();
 				encoding->setElementEncodingType(encodetype);
 				if (encodetype == UNARY || encodetype == ONEHOT) {