Merge pull request #403 from smowton/find_scopes_for_anonymous_variables

Find scopes for anonymous variables

Author: kroening

regression/cbmc-java/LocalVarTable5/test.class

@@ -0,0 +1,10 @@
+CORE
+test.class
+--show-goto-functions
+dead anonlocal::1i
+dead anonlocal::2i
+dead anonlocal::3a
+dead new_tmp0
+^EXIT=0$
+^SIGNAL=0$
+--

regression/cbmc-java/LocalVarTable5/test.desc

@@ -0,0 +1,29 @@
+
+
+public class test
+{
+  public static void main(int unknown)
+  {
+    int i;
+    int j;
+    if(unknown==1)
+    {
+      // Check that anonymous locals
+      // get assigned scopes:
+      i = 0;
+      i++;
+    }
+    else if(unknown==2)
+    {
+      j = 0;
+      j++;
+    }
+    else
+    {
+      // Check that temporaries (here
+      // a new_tmp variable) are treated
+      // likewise
+      test t = new test();
+    }
+  }
+}

regression/cbmc-java/LocalVarTable5/test.java

@@ -712,6 +712,43 @@ code_blockt &java_bytecode_convert_methodt::get_or_create_block_for_pcrange(
         to_code(this_block_children[child_offset])).code());
 }
 
+static void gather_symbol_live_ranges(
+  unsigned pc,
+  const exprt &e,
+  std::map<irep_idt, java_bytecode_convert_methodt::variablet> &result)
+{
+  if(e.id()==ID_symbol)
+  {
+    const auto &symexpr=to_symbol_expr(e);
+    auto findit=
+      result.insert({
+        symexpr.get_identifier(),
+        java_bytecode_convert_methodt::variablet()});
+    auto &var=findit.first->second;
+    if(findit.second)
+    {
+      var.symbol_expr=symexpr;
+      var.start_pc=pc;
+      var.length=1;
+    }
+    else
+    {
+      if(pc<var.start_pc)
+      {
+        var.length+=(var.start_pc-pc);
+        var.start_pc=pc;
+      }
+      else
+      {
+        var.length=std::max(var.length, (pc-var.start_pc)+1);
+      }
+    }
+  }
+  else
+    forall_operands(it, e)
+      gather_symbol_live_ranges(pc, *it, result);
+}
+
 /*******************************************************************\
 
 Function: java_bytecode_convert_methodt::convert_instructions
@@ -1959,10 +1996,9 @@ codet java_bytecode_convert_methodt::convert_instructions(
   // review successor computation of athrow!
   code_blockt code;
 
-  // locals
+  // Add anonymous locals to the symtab:
   for(const auto &var : used_local_names)
   {
-    code.add(code_declt(var));
     symbolt new_symbol;
     new_symbol.name=var.get_identifier();
     new_symbol.type=var.type();
@@ -1975,11 +2011,6 @@ codet java_bytecode_convert_methodt::convert_instructions(
     new_symbol.is_lvalue=true;
     symbol_table.add(new_symbol);
   }
-  // temporaries
-  for(const auto &var : tmp_vars)
-  {
-    code.add(code_declt(var));
-  }
 
   // Try to recover block structure as indicated in the local variable table:
 
@@ -2025,44 +2056,61 @@ codet java_bytecode_convert_methodt::convert_instructions(
     start_new_block=address_pair.second.successors.size()>1;
   }
 
+  // Find out where temporaries are used:
+  std::map<irep_idt, variablet> temporary_variable_live_ranges;
+  for(const auto &aentry : address_map)
+    gather_symbol_live_ranges(
+      aentry.first,
+      aentry.second.code,
+      temporary_variable_live_ranges);
+
+  std::vector<const variablet*> vars_to_process;
   for(const auto &vlist : variables)
-  {
     for(const auto &v : vlist)
-    {
-      if(v.is_parameter)
-        continue;
-      // Merge lexical scopes as far as possible to allow us to
-      // declare these variable scopes faithfully.
-      // Don't insert yet, as for the time being the blocks' only
-      // operands must be other blocks.
-      // The declarations will be inserted in the next pass instead.
-      get_or_create_block_for_pcrange(
-        root,
-        root_block,
-        v.start_pc,
-        v.start_pc+v.length,
-        std::numeric_limits<unsigned>::max(),
-        address_map);
-    }
+      vars_to_process.push_back(&v);
+
+  for(const auto &v : tmp_vars)
+    vars_to_process.push_back(
+      &temporary_variable_live_ranges.at(v.get_identifier()));
+
+  for(const auto &v : used_local_names)
+    vars_to_process.push_back(
+      &temporary_variable_live_ranges.at(v.get_identifier()));
+
+  for(const auto vp : vars_to_process)
+  {
+    const auto &v=*vp;
+    if(v.is_parameter)
+      continue;
+    // Merge lexical scopes as far as possible to allow us to
+    // declare these variable scopes faithfully.
+    // Don't insert yet, as for the time being the blocks' only
+    // operands must be other blocks.
+    // The declarations will be inserted in the next pass instead.
+    get_or_create_block_for_pcrange(
+      root,
+      root_block,
+      v.start_pc,
+      v.start_pc+v.length,
+      std::numeric_limits<unsigned>::max(),
+      address_map);
   }
-  for(const auto &vlist : variables)
+  for(const auto vp : vars_to_process)
   {
-    for(const auto &v : vlist)
-    {
-      if(v.is_parameter)
-        continue;
-      // Skip anonymous variables:
-      if(v.symbol_expr.get_identifier()==irep_idt())
-        continue;
-      auto &block=get_block_for_pcrange(
-        root,
-        root_block,
-        v.start_pc,
-        v.start_pc+v.length,
-        std::numeric_limits<unsigned>::max());
-      code_declt d(v.symbol_expr);
-      block.operands().insert(block.operands().begin(), d);
-    }
+    const auto &v=*vp;
+    if(v.is_parameter)
+      continue;
+    // Skip anonymous variables:
+    if(v.symbol_expr.get_identifier()==irep_idt())
+      continue;
+    auto &block=get_block_for_pcrange(
+      root,
+      root_block,
+      v.start_pc,
+      v.start_pc+v.length,
+      std::numeric_limits<unsigned>::max());
+    code_declt d(v.symbol_expr);
+    block.operands().insert(block.operands().begin(), d);
   }
 
   for(auto &block : root_block.operands())

src/java_bytecode/java_bytecode_convert_method.cpp

@@ -73,7 +73,6 @@ class java_bytecode_convert_methodt:public messaget
   typedef std::vector<local_variable_with_holest>
     local_variable_table_with_holest;
 
-protected:
   class variablet
   {
   public:
@@ -85,6 +84,7 @@ class java_bytecode_convert_methodt:public messaget
     variablet() : symbol_expr(), start_pc(0), length(0), is_parameter(false) {}
   };
 
+ protected:
   typedef std::vector<variablet> variablest;
   expanding_vector<variablest> variables;
   std::set<symbol_exprt> used_local_names;