Interpreter: fix conditional-address

smowton · smowton · commit fb348fa54ea1 · 2016-09-02T17:21:41.000+01:00
diff --git a/src/goto-programs/interpreter_evaluate.cpp b/src/goto-programs/interpreter_evaluate.cpp
@@ -965,7 +965,10 @@ mp_integer interpretert::evaluate_address(const exprt &expr, bool fail_quietly)
   else if(expr.id()==ID_if)
   {
     std::vector<mp_integer> result;
-    evaluate(expr,result);
+    if_exprt address_cond(expr.op0(),
+                          address_of_exprt(expr.op1()),
+                          address_of_exprt(expr.op2()));
+    evaluate(address_cond,result);
     if(result.size()==1)
       return result[0];
   }

Original file line number	Diff line number	Diff line change
`@@ -965,7 +965,10 @@ mp_integer interpretert::evaluate_address(const exprt &expr, bool fail_quietly)`
`965`	`965`	`else if(expr.id()==ID_if)`
`966`	`966`	`{`
`967`	`967`	`std::vector<mp_integer> result;`
`968`		`- evaluate(expr,result);`
	`968`	`+ if_exprt address_cond(expr.op0(),`
	`969`	`+ address_of_exprt(expr.op1()),`
	`970`	`+ address_of_exprt(expr.op2()));`
	`971`	`+ evaluate(address_cond,result);`
`969`	`972`	`if(result.size()==1)`
`970`	`973`	`return result[0];`
`971`	`974`	`}`