Merge branch 'release-2.6.2'

Author: zvonimir

Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = smack
-PROJECT_NUMBER         = 2.6.1
+PROJECT_NUMBER         = 2.6.2
 PROJECT_BRIEF          = "A bounded software verifier."
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = docs

lib/smack/RewriteBitwiseOps.cpp

@@ -104,14 +104,14 @@ bool RewriteBitwiseOps::runOnModule(Module &m) {
             Function *co;
             if (bitWidth == 64) {
               co = m.getFunction("__SMACK_and64");
+            } else if (bitWidth == 32) {
+              co = m.getFunction("__SMACK_and32");
             } else if (bitWidth == 16) {
               co = m.getFunction("__SMACK_and16");
             } else if (bitWidth == 8) {
               co = m.getFunction("__SMACK_and8");
-            } else if (bitWidth == 1) {
-              continue;
             } else {
-              co = m.getFunction("__SMACK_and32");
+              continue;
             }
             assert(co != NULL && "Function __SMACK_and should be present.");
             std::vector<Value *> args;
@@ -133,14 +133,14 @@ bool RewriteBitwiseOps::runOnModule(Module &m) {
           Function *co;
           if (bitWidth == 64) {
             co = m.getFunction("__SMACK_or64");
+          } else if (bitWidth == 32) {
+            co = m.getFunction("__SMACK_or32");
           } else if (bitWidth == 16) {
             co = m.getFunction("__SMACK_or16");
           } else if (bitWidth == 8) {
             co = m.getFunction("__SMACK_or8");
-          } else if (bitWidth == 1) {
-            continue;
           } else {
-            co = m.getFunction("__SMACK_or32");
+            continue;
           }
           assert(co != NULL && "Function __SMACK_or should be present.");
           std::vector<Value *> args;

share/smack/reach.py

@@ -11,7 +11,7 @@
 from smackgen import *
 from smackverify import *
 
-VERSION = '2.6.1'
+VERSION = '2.6.2'
 
 
 def reachParser():

share/smack/top.py

@@ -13,7 +13,7 @@
 from .frontend import link_bc_files, frontends, languages, extra_libs
 from .errtrace import error_trace, smackdOutput
 
-VERSION = '2.6.1'
+VERSION = '2.6.2'
 
 
 class VResult(Flag):