From 781c9bab7cf7cf44bc7b8da1f1ce2be3436b2e71 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 12 Nov 2018 08:46:50 +0000
Subject: [PATCH] Do not shadow "resolved"

The values refer to different invocations of the resolving attempt.
---
 src/goto-programs/remove_const_function_pointers.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/goto-programs/remove_const_function_pointers.cpp b/src/goto-programs/remove_const_function_pointers.cpp
index d109fcc9254..df6d9c9107d 100644
--- a/src/goto-programs/remove_const_function_pointers.cpp
+++ b/src/goto-programs/remove_const_function_pointers.cpp
@@ -697,11 +697,10 @@ bool remove_const_function_pointerst::try_resolve_dereference(
         address_of_exprt address_expr=to_address_of_expr(pointer_val);
         bool object_const=false;
         expressionst out_object_values;
-        bool resolved=
-          try_resolve_expression(
-            address_expr.object(), out_object_values, object_const);
+        const bool resolved_address = try_resolve_expression(
+          address_expr.object(), out_object_values, object_const);
 
-        if(resolved)
+        if(resolved_address)
         {
           out_expressions.insert(
             out_expressions.end(),