Drop intermediary reference to keep only one if

The declaration of the reference class_json_value prevented merging the
two if, and it can be removed without making the code more complicated
since it is just an alias for class_entry->second

Author: romainbrenguier

jbmc/src/java_bytecode/java_static_initializers.cpp

@@ -802,44 +802,40 @@ code_blockt get_user_specified_clinit_body(
   }
   const auto class_entry =
     static_values_json.find(id2string(strip_java_namespace_prefix(class_id)));
-  if(class_entry != static_values_json.end())
+  if(class_entry != static_values_json.end() && class_entry->second.is_object())
   {
-    const auto &class_json_value = class_entry->second;
-    if(class_json_value.is_object())
+    const auto &class_json_object = to_json_object(class_entry->second);
+    std::map<symbol_exprt, jsont> static_field_values;
+    for(const auto &symbol_pair :
+      equal_range(class_to_declared_symbols_map, class_id))
     {
-      const auto &class_json_object = to_json_object(class_json_value);
-      std::map<symbol_exprt, jsont> static_field_values;
-      for(const auto &symbol_pair :
-          equal_range(class_to_declared_symbols_map, class_id))
+      const symbolt &symbol = symbol_pair.second;
+      if(symbol.is_static_lifetime)
       {
-        const symbolt &symbol = symbol_pair.second;
-        if(symbol.is_static_lifetime)
+        const symbol_exprt &static_field_expr = symbol.symbol_expr();
+        const auto &static_field_entry =
+          class_json_object.find(id2string(symbol.base_name));
+        if(static_field_entry != class_json_object.end())
         {
-          const symbol_exprt &static_field_expr = symbol.symbol_expr();
-          const auto &static_field_entry =
-            class_json_object.find(id2string(symbol.base_name));
-          if(static_field_entry != class_json_object.end())
-          {
-            static_field_values.insert(
-              {static_field_expr, static_field_entry->second});
-          }
+          static_field_values.insert(
+            {static_field_expr, static_field_entry->second});
         }
       }
-      code_blockt body;
-      for(const auto &value_pair : static_field_values)
-      {
-        assign_from_json(
-          value_pair.first,
-          value_pair.second,
-          real_clinit_name,
-          body,
-          symbol_table,
-          needed_lazy_methods,
-          max_user_array_length,
-          references);
-      }
-      return body;
     }
+    code_blockt body;
+    for(const auto &value_pair : static_field_values)
+    {
+      assign_from_json(
+        value_pair.first,
+        value_pair.second,
+        real_clinit_name,
+        body,
+        symbol_table,
+        needed_lazy_methods,
+        max_user_array_length,
+        references);
+    }
+    return body;
   }
   return code_blockt{{code_function_callt{clinit_func->symbol_expr()}}};
 }