Merge pull request diffblue#2471 from tautschnig/vs-non-static

Do not unnecessarily mark local variables static

Author: Daniel Kroening

jbmc/src/java_bytecode/expr2java.h

@@ -58,8 +58,8 @@ std::string type2java(const typet &type, const namespacet &ns);
 template <typename float_type>
 std::string floating_point_to_java_string(float_type value)
 {
-  static const bool is_float = std::is_same<float_type, float>::value;
-  static const std::string class_name = is_float ? "Float" : "Double";
+  const bool is_float = std::is_same<float_type, float>::value;
+  const std::string class_name = is_float ? "Float" : "Double";
   if(std::isnan(value))
     return class_name + ".NaN";
   if(std::isinf(value) && value >= 0.)

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -846,7 +846,7 @@ const select_pointer_typet &
 void java_bytecode_languaget::methods_provided(
   std::unordered_set<irep_idt> &methods) const
 {
-  static std::string cprover_class_prefix = "java::org.cprover.CProver.";
+  const std::string cprover_class_prefix = "java::org.cprover.CProver.";
 
   // Add all string solver methods to map
   string_preprocess.get_all_function_names(methods);

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -301,9 +301,9 @@ class base_ref_infot : public structured_pool_entryt
 public:
   explicit base_ref_infot(pool_entryt entry) : structured_pool_entryt(entry)
   {
-    static std::set<u1> info_tags = {
-      CONSTANT_Fieldref, CONSTANT_Methodref, CONSTANT_InterfaceMethodref};
-    PRECONDITION(info_tags.find(entry.tag) != info_tags.end());
+    PRECONDITION(
+      entry.tag == CONSTANT_Fieldref || entry.tag == CONSTANT_Methodref ||
+      entry.tag == CONSTANT_InterfaceMethodref);
     class_index = entry.ref1;
     name_and_type_index = entry.ref2;
   }

jbmc/src/java_bytecode/load_method_by_regex.cpp

@@ -41,7 +41,7 @@ bool does_pattern_miss_descriptor(const std::string &pattern)
   if(descriptor_index == std::string::npos)
     return true;
 
-  static const std::string java_prefix = "java::";
+  const std::string java_prefix = "java::";
   return descriptor_index == java_prefix.length() - 1 &&
          has_prefix(pattern, java_prefix);
 }