Don't centralize tgt indexes

Author: lucic71

CMakeLists.txt

@@ -306,20 +306,8 @@ add_custom_command(
 
 add_custom_target("index-cpp-rules" ALL DEPENDS ${CMAKE_BINARY_DIR}/rules_index/c.json ${CMAKE_BINARY_DIR}/rules_index/cpp.json)
 
-set(rust_rules_index_outputs ${CMAKE_BINARY_DIR}/rules_index/index_unsafe.json ${CMAKE_BINARY_DIR}/rules_index/index_refcount.json)
-add_custom_command(
-  OUTPUT ${rust_rules_index_outputs}
-  COMMAND ${CARGO_ENV_RULE_PREPROCESSOR}
-          RUSTUP_TOOLCHAIN=${RUST_NIGHTLY_VERSION}
-          LD_LIBRARY_PATH=${NIGHTLY_SYSROOT}/lib
-          DYLD_LIBRARY_PATH=${NIGHTLY_SYSROOT}/lib
-          ${PREPROCESSOR_BIN} --merge ${CMAKE_BINARY_DIR}/rules_index ${RULES_IR_DIR}
-  DEPENDS ${rust_rules_ir_outputs} ${PREPROCESSOR_BIN}
-  VERBATIM
-)
-
 add_custom_target("preprocess-rust-rules" ALL
-                  DEPENDS ${rust_rules_ir_outputs} ${rust_rules_index_outputs})
+                  DEPENDS ${rust_rules_ir_outputs})
 
 set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
   "${CMAKE_BINARY_DIR}/libcc2rs-target"

cpp2rust/CMakeLists.txt

@@ -20,6 +20,7 @@ target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_RESOURCE_DIR=\"${LLVM_L
 target_compile_definitions(cpp2rust_core PUBLIC "-DCOMPAT_INCLUDE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/compat\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DRULES_SRC_DIR=\"${PROJECT_SOURCE_DIR}/rules\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DRULES_INDEX_DIR=\"${CMAKE_BINARY_DIR}/rules_index\"")
+target_compile_definitions(cpp2rust_core PUBLIC "-DRULES_IR_DIR=\"${CMAKE_BINARY_DIR}/rules\"")
 target_compile_definitions(cpp2rust_core PUBLIC "-DRUST_STABLE_VERSION=\"${RUST_STABLE_VERSION}\"")
 
 if (APPLE)

cpp2rust/converter/rules/registry.cpp

@@ -37,23 +37,16 @@ std::unordered_multimap<RuleDecls::ExprKey, ExprRuleDecl,
     exprs_;
 std::unordered_multimap<const void *, TypeRuleDecl> types_;
 
-const llvm::json::Object &unsafeIndex() {
-  static const llvm::json::Object index = RulesLoader::ReadIndex(
-      std::filesystem::path(RULES_INDEX_DIR) / "index_unsafe.json");
-  return index;
-}
-
-const llvm::json::Object &refcountIndex() {
-  static const llvm::json::Object index = RulesLoader::ReadIndex(
-      std::filesystem::path(RULES_INDEX_DIR) / "index_refcount.json");
-  return index;
-}
-
-const llvm::json::Object *findRule(const llvm::json::Object &index,
-                                   const std::string &dir,
+const llvm::json::Object *findRule(Model model, const std::string &dir,
                                    const std::string &name) {
-  auto rules = index.getObject(dir);
-  return rules ? rules->getObject(name) : nullptr;
+  static std::unordered_map<std::string, llvm::json::Object> indexes;
+  auto path = std::filesystem::path(RULES_IR_DIR) / dir /
+              (model == Model::kRefCount ? "ir_refcount.json" : "ir_unsafe.json");
+  auto [it, inserted] = indexes.try_emplace(path.string());
+  if (inserted && std::filesystem::exists(path)) {
+    it->second = RulesLoader::ReadIndex(path);
+  }
+  return it->second.getObject(name);
 }
 
 bool pointsToUserType(clang::QualType type) {
@@ -114,9 +107,9 @@ void checkGenerics(const std::string &dir, const std::string &name,
 
 void addRule(clang::ASTContext &ctx, const std::string &dir,
              const std::string &name, const clang::NamedDecl *decl) {
-  auto rule = findRule(unsafeIndex(), dir, name);
+  auto rule = findRule(Model::kUnsafe, dir, name);
   if (model_ == Model::kRefCount) {
-    if (auto refcount_rule = findRule(refcountIndex(), dir, name)) {
+    if (auto refcount_rule = findRule(model_, dir, name)) {
       rule = refcount_rule;
     }
   }