Use add_const where relevent in rename

In some places the non const version of .type() and others would be
called.
We force the const version to be called by using add_const.

Author: romainbrenguier

src/goto-symex/goto_symex_state.cpp

@@ -14,6 +14,7 @@ Author: Daniel Kroening, [email protected]
 #include <cstdlib>
 #include <iostream>
 
+#include <util/add_const.h>
 #include <util/base_exceptions.h>
 #include <util/exception_utils.h>
 #include <util/expr_util.h>
@@ -315,7 +316,7 @@ void goto_symex_statet::rename(
   else if(expr.id()==ID_symbol)
   {
     // we never rename function symbols
-    if(expr.type().id() == ID_code)
+    if(add_const(expr).type().id() == ID_code)
     {
       rename(
         expr.type(),
@@ -333,7 +334,8 @@ void goto_symex_statet::rename(
   {
     auto &address_of_expr = to_address_of_expr(expr);
     rename_address(address_of_expr.object(), ns, level);
-    to_pointer_type(expr.type()).subtype() = address_of_expr.object().type();
+    to_pointer_type(expr.type()).subtype() =
+      add_const(address_of_expr).object().type();
   }
   else
   {
@@ -345,10 +347,12 @@ void goto_symex_statet::rename(
 
     INVARIANT(
       (expr.id() != ID_with ||
-       expr.type() == to_with_expr(expr).old().type()) &&
+       add_const(expr).type() == to_with_expr(add_const(expr)).old().type()) &&
         (expr.id() != ID_if ||
-         (expr.type() == to_if_expr(expr).true_case().type() &&
-          expr.type() == to_if_expr(expr).false_case().type())),
+         (add_const(expr).type() ==
+            to_if_expr(add_const(expr)).true_case().type() &&
+          add_const(expr).type() ==
+            to_if_expr(add_const(expr)).false_case().type())),
       "Type of renamed expr should be the same as operands for with_exprt and "
       "if_exprt");
   }