Do not unnecessarily mark local variables static

tautschnig · tautschnig · commit 7191f2355b9a · 2018-06-25T17:30:58.000+01:00
diff --git a/jbmc/src/java_bytecode/expr2java.h b/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.)
diff --git a/jbmc/src/java_bytecode/java_bytecode_language.cpp b/jbmc/src/java_bytecode/java_bytecode_language.cpp
@@ -845,7 +845,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);
diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/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;
   }
diff --git a/jbmc/src/java_bytecode/load_method_by_regex.cpp b/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);
 }

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ const select_pointer_typet &`
`845`	`845`	`void java_bytecode_languaget::methods_provided(`
`846`	`846`	`std::unordered_set<irep_idt> &methods) const`
`847`	`847`	`{`
`848`		`- static std::string cprover_class_prefix = "java::org.cprover.CProver.";`
	`848`	`+ const std::string cprover_class_prefix = "java::org.cprover.CProver.";`
`849`	`849`
`850`	`850`	`// Add all string solver methods to map`
`851`	`851`	`string_preprocess.get_all_function_names(methods);`
Original file line number	Diff line number	Diff line change
`@@ -301,9 +301,9 @@ class base_ref_infot : public structured_pool_entryt`
`301`	`301`	`public:`
`302`	`302`	`explicit base_ref_infot(pool_entryt entry) : structured_pool_entryt(entry)`
`303`	`303`	`{`
`304`		`- static std::set<u1> info_tags = {`
`305`		`- CONSTANT_Fieldref, CONSTANT_Methodref, CONSTANT_InterfaceMethodref};`
`306`		`- PRECONDITION(info_tags.find(entry.tag) != info_tags.end());`
	`304`	`+ PRECONDITION(`
	`305`	`+ entry.tag == CONSTANT_Fieldref \|\| entry.tag == CONSTANT_Methodref \|\|`
	`306`	`+ entry.tag == CONSTANT_InterfaceMethodref);`
`307`	`307`	`class_index = entry.ref1;`
`308`	`308`	`name_and_type_index = entry.ref2;`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ bool does_pattern_miss_descriptor(const std::string &pattern)`
`41`	`41`	`if(descriptor_index == std::string::npos)`
`42`	`42`	`return true;`
`43`	`43`
`44`		`- static const std::string java_prefix = "java::";`
	`44`	`+ const std::string java_prefix = "java::";`
`45`	`45`	`return descriptor_index == java_prefix.length() - 1 &&`
`46`	`46`	`has_prefix(pattern, java_prefix);`
`47`	`47`	`}`