Do not add named vars to used_local_names

smowton · smowton · commit 9192175d5f55 · 2017-01-31T14:25:59.000Z
Commit 67f4019 accidentally reverted java_bytecode_convert_methodt::variable to an earlier version. This restores the version as of branch smowton/find_scopes_for_anonymous_variables Fixes failure of test cbmc-java/inferlexicalscope1
diff --git a/src/java_bytecode/java_bytecode_convert_method.cpp b/src/java_bytecode/java_bytecode_convert_method.cpp
@@ -170,8 +170,6 @@ const exprt java_bytecode_convert_methodt::variable(
   else
   {
     exprt result=var.symbol_expr;
-    if(!var.is_parameter)
-      used_local_names.insert(to_symbol_expr(result));
     if(do_cast==CAST_AS_NEEDED && t!=result.type())
       result=typecast_exprt(result, t);
     return result;

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,6 @@ const exprt java_bytecode_convert_methodt::variable(`
`170`	`170`	`else`
`171`	`171`	`{`
`172`	`172`	`exprt result=var.symbol_expr;`
`173`		`- if(!var.is_parameter)`
`174`		`- used_local_names.insert(to_symbol_expr(result));`
`175`	`173`	`if(do_cast==CAST_AS_NEEDED && t!=result.type())`
`176`	`174`	`result=typecast_exprt(result, t);`
`177`	`175`	`return result;`