Merge pull request #3223 from diffblue/fixup-PR3100

Joel Allred · web-flow · commit abeebfedbed0 · 2018-10-24T08:39:53.000+01:00
Fix index expression in interpretert::evaluate
diff --git a/src/goto-programs/interpreter_evaluate.cpp b/src/goto-programs/interpreter_evaluate.cpp
@@ -930,8 +930,7 @@ void interpretert::evaluate(
         evaluate(expr.op1(), idx);
         if(idx.size() == 1)
         {
-          evaluated_index.op1() =
-            constant_exprt(integer2string(idx[0]), expr.op1().type());
+          evaluated_index.op1() = from_integer(idx[0], expr.op1().type());
         }
         simplified = simplify_expr(evaluated_index, ns);
       }

Original file line number	Diff line number	Diff line change
`@@ -930,8 +930,7 @@ void interpretert::evaluate(`
`930`	`930`	`evaluate(expr.op1(), idx);`
`931`	`931`	`if(idx.size() == 1)`
`932`	`932`	`{`
`933`		`- evaluated_index.op1() =`
`934`		`- constant_exprt(integer2string(idx[0]), expr.op1().type());`
	`933`	`+ evaluated_index.op1() = from_integer(idx[0], expr.op1().type());`
`935`	`934`	`}`
`936`	`935`	`simplified = simplify_expr(evaluated_index, ns);`
`937`	`936`	`}`