clinit_wrapper cont. (to be squashed later)

svorenova · svorenova · commit 2376b329fa35 · 2018-08-06T15:41:19.000+01:00
diff --git a/jbmc/src/java_bytecode/java_static_initializers.cpp b/jbmc/src/java_bytecode/java_static_initializers.cpp
@@ -229,32 +229,41 @@ static void clinit_wrapper_do_recursive_calls(
       object_factory_parameterst parameters = object_factory_parameters;
       parameters.function_id = clinit_wrapper_name(class_name);
 
-      for(const auto &symbol : symbol_table.symbols)
+      std::vector<irep_idt> nondet_ids;
+      std::for_each(
+        symbol_table.symbols.begin(),
+        symbol_table.symbols.end(),
+        [&](const std::pair<irep_idt, symbolt> &symbol) {
+          if(
+            symbol.second.type.get(ID_C_class) == class_name &&
+            symbol.second.is_static_lifetime &&
+            !symbol.second.type.get_bool(ID_C_constant))
+          {
+            nondet_ids.push_back(symbol.first);
+          }
+        });
+
+      for(const auto &id : nondet_ids)
       {
-        if(
-          symbol.second.type.get(ID_C_class) == class_name &&
-          symbol.second.is_static_lifetime &&
-          !symbol.second.type.get_bool(ID_C_constant))
-        {
-          const symbol_exprt new_global_symbol = symbol.second.symbol_expr();
-
-          parameters.max_nonnull_tree_depth =
-            is_non_null_library_global(symbol.first)
-              ? std::max(
-                  size_t(1), object_factory_parameters.max_nonnull_tree_depth)
-              : object_factory_parameters.max_nonnull_tree_depth;
-
-          gen_nondet_init(
-            new_global_symbol,
-            init_body,
-            symbol_table,
-            source_locationt(),
-            false,
-            allocation_typet::DYNAMIC,
-            parameters,
-            pointer_type_selector,
-            update_in_placet::NO_UPDATE_IN_PLACE);
-        }
+        const symbol_exprt new_global_symbol =
+          symbol_table.lookup_ref(id).symbol_expr();
+
+        parameters.max_nonnull_tree_depth =
+          is_non_null_library_global(id)
+            ? std::max(
+                size_t(1), object_factory_parameters.max_nonnull_tree_depth)
+            : object_factory_parameters.max_nonnull_tree_depth;
+
+        gen_nondet_init(
+          new_global_symbol,
+          init_body,
+          symbol_table,
+          source_locationt(),
+          false,
+          allocation_typet::DYNAMIC,
+          parameters,
+          pointer_type_selector,
+          update_in_placet::NO_UPDATE_IN_PLACE);
       }
     }
   }
