Important bugfix. r1423 introduced a defect that gives the wrong result.

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@1485 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index 58f96dbfbc05d86e22e8c7c4e7053ca554fc21c0..183f0c92acc9ca27dadf95ea4bca348c8c206e1d 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -10,8 +10,8 @@
 
 -include $(TOP)/scripts/config.info
 
-OPTIMIZE      = -O3 -DNDEBUG -march=native -fomit-frame-pointer # Optimization
-#OPTIMIZE      =  -O3 -g            # Debug
+#OPTIMIZE      = -O3 -DNDEBUG -march=native -fomit-frame-pointer # Optimization
+OPTIMIZE      =  -O3 -g            # Debug
 
 # To enable 128-bit indices in the array propagators. Put the INDICES_128BITS
 # option into CFLAGS_M32. Weird I know.

diff --git a/src/AST/NodeFactory/SimplifyingNodeFactory.cpp b/src/AST/NodeFactory/SimplifyingNodeFactory.cpp
index 41ff652c116212a140352058b17b9d01ea4d72b5..754070d222160dd35b0a2042cfdb62585d4f028a 100644 (file)
--- a/src/AST/NodeFactory/SimplifyingNodeFactory.cpp
+++ b/src/AST/NodeFactory/SimplifyingNodeFactory.cpp
@@ -1380,7 +1380,7 @@ SimplifyingNodeFactory::CreateTerm(Kind kind, unsigned int width, const ASTVec &
       if (children[1].isConstant() && CONSTANTBV::BitVector_is_empty(children[1].GetBVConst()))
         result = children[0];
 
-      if (children[0].GetKind() == BVPLUS && children[0][0] == bm.CreateMaxConst(width)
+      if (children[0].GetKind() == BVPLUS && children[0].Degree() == 2 && children[0][0] == bm.CreateMaxConst(width)
           && children[1] == children[0][1])
         result = children[0];