Typing and refactoring of simplify_extractbits

Author: tautschnig

src/util/simplify_expr.cpp

@@ -2317,7 +2317,7 @@ bool simplify_exprt::simplify_node(exprt &expr)
   else if(expr.id()==ID_concatenation)
     result=simplify_concatenation(expr) && result;
   else if(expr.id()==ID_extractbits)
-    result=simplify_extractbits(expr) && result;
+    result = simplify_extractbits(to_extractbits_expr(expr)) && result;
   else if(expr.id()==ID_ieee_float_equal ||
           expr.id()==ID_ieee_float_notequal)
     result=simplify_ieee_float_relation(expr) && result;

src/util/simplify_expr_class.h

@@ -25,6 +25,7 @@ class bswap_exprt;
 class byte_extract_exprt;
 class byte_update_exprt;
 class exprt;
+class extractbits_exprt;
 class if_exprt;
 class index_exprt;
 class member_exprt;
@@ -63,7 +64,7 @@ class simplify_exprt
 
   bool simplify_typecast(exprt &expr);
   bool simplify_extractbit(exprt &expr);
-  bool simplify_extractbits(exprt &expr);
+  bool simplify_extractbits(extractbits_exprt &expr);
   bool simplify_concatenation(exprt &expr);
   bool simplify_mult(exprt &expr);
   bool simplify_div(exprt &expr);

src/util/simplify_expr_int.cpp

@@ -18,6 +18,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "expr_util.h"
 #include "fixedbv.h"
 #include "ieee_float.h"
+#include "invariant.h"
 #include "namespace.h"
 #include "rational.h"
 #include "rational_tools.h"
@@ -1101,34 +1102,32 @@ bool simplify_exprt::simplify_power(exprt &expr)
 }
 
 /// Simplifies extracting of bits from a constant.
-bool simplify_exprt::simplify_extractbits(exprt &expr)
+bool simplify_exprt::simplify_extractbits(extractbits_exprt &expr)
 {
-  assert(expr.operands().size()==3);
-
-  const typet &op0_type=expr.op0().type();
+  const typet &op0_type = expr.src().type();
 
   if(!is_bitvector_type(op0_type) &&
      !is_bitvector_type(expr.type()))
     return true;
 
-  if(expr.op0().is_constant())
-  {
-    std::size_t width=to_bitvector_type(op0_type).get_width();
-    mp_integer start, end;
+  mp_integer start, end;
 
-    if(to_integer(expr.op1(), start))
-      return true;
+  if(to_integer(expr.upper(), start))
+    return true;
 
-    if(to_integer(expr.op2(), end))
-      return true;
+  if(to_integer(expr.lower(), end))
+    return true;
 
-    if(start<0 || start>=width ||
-       end<0 || end>=width)
-      return true;
+  const std::size_t width = to_bitvector_type(op0_type).get_width();
 
-    assert(start>=end); // is this always the case??
+  if(start < 0 || start >= width || end < 0 || end >= width)
+    return true;
 
-    const irep_idt &value=expr.op0().get(ID_value);
+  PRECONDITION(start >= end);
+
+  if(expr.src().is_constant())
+  {
+    const irep_idt &value = to_constant_expr(expr.src()).get_value();
 
     if(value.size()!=width)
       return true;
@@ -1139,7 +1138,8 @@ bool simplify_exprt::simplify_extractbits(exprt &expr)
       svalue.substr(width-integer2size_t(start)-1,
                     integer2size_t(start-end+1));
 
-    expr = constant_exprt(extracted_value, expr.type());
+    constant_exprt result(extracted_value, expr.type());
+    expr.swap(result);
 
     return false;
   }