precompute the category of the classpath entry

Author: Daniel Kroening

jbmc/src/java_bytecode/java_class_loader.cpp

@@ -70,7 +70,15 @@ java_class_loadert::parse_tree_with_overlayst &java_class_loadert::operator()(
 
 void java_class_loadert::add_classpath_entry(const std::string &path)
 {
-  classpath_entries.push_back(path);
+  if(has_suffix(path, ".jar"))
+  {
+    classpath_entries.push_back(classpath_entryt(classpath_entryt::JAR, path));
+  }
+  else
+  {
+    classpath_entries.push_back(
+      classpath_entryt(classpath_entryt::DIRECTORY, path));
+  }
 }
 
 optionalt<java_bytecode_parse_treet> java_class_loadert::get_class_from_jar(
@@ -131,40 +139,44 @@ java_class_loadert::get_parse_tree(
   // Rummage through the class path
   for(const auto &cp_entry : classpath_entries)
   {
-    if(has_suffix(cp_entry, ".jar"))
-    {
-      jar_index_optcreft index = read_jar_file(cp_entry);
-      if(!index)
-        continue;
-      optionalt<java_bytecode_parse_treet> parse_tree =
-        get_class_from_jar(class_name, cp_entry, *index);
-      if(parse_tree)
-        parse_trees.emplace_back(std::move(*parse_tree));
-    }
-    else
+    switch(cp_entry.kind)
     {
-      // Look in the given directory
-      const std::string class_file = class_name_to_file(class_name);
-      const std::string full_path =
-        #ifdef _WIN32
-        cp_entry + '\\' + class_file;
-        #else
-        cp_entry + '/' + class_file;
-        #endif
-
-      if(!class_loader_limit.load_class_file(class_file))
-        continue;
-
-      if(std::ifstream(full_path))
+    case classpath_entryt::JAR:
       {
-        debug()
-          << "Getting class `" << class_name << "' from file " << full_path
-          << eom;
+        jar_index_optcreft index = read_jar_file(cp_entry.path);
+        if(!index)
+          continue;
         optionalt<java_bytecode_parse_treet> parse_tree =
-          java_bytecode_parse(full_path, get_message_handler());
+          get_class_from_jar(class_name, cp_entry.path, *index);
         if(parse_tree)
           parse_trees.emplace_back(std::move(*parse_tree));
       }
+      break;
+
+    case classpath_entryt::DIRECTORY:
+      {
+        // Look in the given directory
+        const std::string class_file = class_name_to_file(class_name);
+        const std::string full_path =
+#ifdef _WIN32
+          cp_entry.path + '\\' + class_file;
+#else
+          cp_entry.path + '/' + class_file;
+#endif
+
+        if(!class_loader_limit.load_class_file(class_file))
+          continue;
+
+        if(std::ifstream(full_path))
+        {
+          debug() << "Getting class `" << class_name << "' from file "
+                  << full_path << eom;
+          optionalt<java_bytecode_parse_treet> parse_tree =
+            java_bytecode_parse(full_path, get_message_handler());
+          if(parse_tree)
+            parse_trees.emplace_back(std::move(*parse_tree));
+        }
+      }
     }
   }
 
@@ -226,7 +238,8 @@ void java_class_loadert::load_entire_jar(
   if(!jar_index)
     return;
 
-  classpath_entries.push_front(jar_path);
+  classpath_entries.push_front(
+    classpath_entryt(classpath_entryt::JAR, jar_path));
 
   for(const auto &e : jar_index->get())
     operator()(e.first);

jbmc/src/java_bytecode/java_class_loader.h

@@ -119,8 +119,21 @@ class java_class_loadert:public messaget
   /// information.
   std::string java_cp_include_files;
 
+  /// An entry in the classpath
+  struct classpath_entryt
+  {
+    using kindt = enum { JAR, DIRECTORY };
+    kindt kind;
+    std::string path;
+
+    classpath_entryt(kindt _kind, const std::string &_path)
+      : kind(_kind), path(_path)
+    {
+    }
+  };
+
   /// List of entries in the classpath
-  std::list<std::string> classpath_entries;
+  std::list<classpath_entryt> classpath_entries;
 
   /// Classes to be explicitly loaded
   std::vector<irep_idt> java_load_classes;