Revert "integer dereferences are now re-written to a custom expression"

This reverts commit 2b17564.

ID_integer_dereference has not been supported in any back-end. The new pointer
encoding should happily take care of such integer -> pointer type casts.

Author: tautschnig

src/pointer-analysis/dereference.cpp

@@ -264,17 +264,20 @@ exprt dereferencet::dereference_typecast(
     return dereference_rec(op, offset, type); // just pass down
   else if(op_type.id()==ID_signedbv || op_type.id()==ID_unsignedbv)
   {
-    // We got an integer-typed address A. We turn this
-    // into integer_dereference(A+offset),
-    // and then let some other layer worry about it.
+    // We got an integer-typed address A. We turn this back (!)
+    // into *(type *)(A+offset), and then let some other layer
+    // worry about it.
 
     exprt integer=op;
 
     if(!offset.is_zero())
       integer=
         plus_exprt(offset, typecast_exprt(op, offset.type()));
 
-    return unary_exprt(ID_integer_dereference, integer, type);
+    exprt new_typecast=
+      typecast_exprt(integer, pointer_type(type));
+
+    return dereference_exprt(new_typecast, type);
   }
   else
     throw "dereferencet: unexpected cast";

src/util/irep_ids.def

@@ -827,7 +827,6 @@ IREP_ID_ONE(array_replace)
 IREP_ID_ONE(switch_case_number)
 IREP_ID_ONE(java_array_access)
 IREP_ID_ONE(java_member_access)
-IREP_ID_ONE(integer_dereference)
 IREP_ID_TWO(C_java_generic_parameter, #java_generic_parameter)
 IREP_ID_TWO(C_java_generic_type, #java_generic_type)
 IREP_ID_TWO(C_java_generics_class_type, #java_generics_class_type)