From: trevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Date: Tue, 10 Jan 2012 03:39:36 +0000 (+0000)
Subject: Important bugfix. r1423 introduced a defect that gives the wrong result.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=ee9d2baf07efbda726299c3881fa3a8774671275;p=francis%2Fstp.git

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 58f96db..183f0c9 100644
--- 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 41ff652..754070d 100644
--- 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];