Remove ID_address_of check for types as it can only be exprt

Matthias Güdemann · Matthias Güdemann · commit 029f70df20d2 · 2018-09-11T16:46:15.000+02:00
diff --git a/src/goto-programs/interpreter.cpp b/src/goto-programs/interpreter.cpp
@@ -600,7 +600,7 @@ exprt interpretert::get_value(
   {
     return from_integer(rhs[integer2size_t(offset)]!=0?1:0, type);
   }
-  else if((real_type.id()==ID_pointer) || (real_type.id()==ID_address_of))
+  else if(real_type.id() == ID_pointer)
   {
     if(rhs[integer2size_t(offset)]==0)
     {
@@ -1090,4 +1090,3 @@ void interpreter(
     message_handler);
   interpreter();
 }
-
diff --git a/src/goto-programs/interpreter_evaluate.cpp b/src/goto-programs/interpreter_evaluate.cpp
@@ -330,8 +330,7 @@ void interpretert::evaluate(
 
       dest.clear();
     }
-    else if((expr.type().id()==ID_pointer)
-         || (expr.type().id()==ID_address_of))
+    else if(expr.type().id() == ID_pointer)
     {
       mp_integer i=0;
       if(expr.has_operands() && expr.op0().id()==ID_address_of)

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ exprt interpretert::get_value(`
`600`	`600`	`{`
`601`	`601`	`return from_integer(rhs[integer2size_t(offset)]!=0?1:0, type);`
`602`	`602`	`}`
`603`		`- else if((real_type.id()==ID_pointer) \|\| (real_type.id()==ID_address_of))`
	`603`	`+ else if(real_type.id() == ID_pointer)`
`604`	`604`	`{`
`605`	`605`	`if(rhs[integer2size_t(offset)]==0)`
`606`	`606`	`{`
`@@ -1090,4 +1090,3 @@ void interpreter(`
`1090`	`1090`	`message_handler);`
`1091`	`1091`	`interpreter();`
`1092`	`1092`	`}`
`1093`		`-`
Original file line number	Diff line number	Diff line change
`@@ -330,8 +330,7 @@ void interpretert::evaluate(`
`330`	`330`
`331`	`331`	`dest.clear();`
`332`	`332`	`}`
`333`		`- else if((expr.type().id()==ID_pointer)`
`334`		`- \|\| (expr.type().id()==ID_address_of))`
	`333`	`+ else if(expr.type().id() == ID_pointer)`
`335`	`334`	`{`
`336`	`335`	`mp_integer i=0;`
`337`	`336`	`if(expr.has_operands() && expr.op0().id()==ID_address_of)`