Pass inst when passing id.

src/codegen/codegen_neuron_cpp_visitor.cpp

@@ -211,8 +211,6 @@
     printer->add_text(" ");
     printer->push_block();
 
-    printer->fmt_line("auto inst = make_instance_{}(*_ml);", info.mod_suffix);
-
     // function requires return variable declaration
     if (node.is_function_block()) {
         auto type = default_float_data_type();
@@ -328,6 +326,7 @@
             _nt = nrn_threads;
         )CODE");
     }
+    printer->fmt_line("auto inst = make_instance_{}(_ml_real);", info.mod_suffix);
     if (info.function_uses_table(block_name)) {
         printer->fmt_line("_check_{}({})", block_name, internal_method_arguments());
     }
@@ -376,13 +375,14 @@
 
 
 std::string CodegenNeuronCppVisitor::internal_method_arguments() {
-    return "_ml, id, _ppvar, _thread, _nt";
+    return "_ml, inst, id, _ppvar, _thread, _nt";
 }
 
 
 CodegenNeuronCppVisitor::ParamVector CodegenNeuronCppVisitor::internal_method_parameters() {
     ParamVector params;
     params.emplace_back("", "_nrn_mechanism_cache_range*", "", "_ml");
+    params.emplace_back("", fmt::format("{}&", instance_struct()), "", "inst");
     params.emplace_back("", "size_t", "", "id");
     params.emplace_back("", "Datum*", "", "_ppvar");
     params.emplace_back("", "Datum*", "", "_thread");
@@ -507,7 +507,7 @@
 std::string CodegenNeuronCppVisitor::int_variable_name(const IndexVariableInfo& symbol,
                                                        const std::string& name,
                                                        bool use_instance) const {
     auto position = position_of_int_var(name);
     if (symbol.is_index) {
         if (use_instance) {
             throw std::runtime_error("Not implemented. [wiejo]");
@@ -785,7 +785,7 @@
     }
 
 
     for (const auto& f: info.function_tables) {
         throw std::runtime_error("Not implemented, global function tables.");
     }
 
@@ -1077,7 +1077,7 @@
 
     for (int i = 0; i < codegen_int_variables_size; ++i) {
         const auto& int_var = codegen_int_variables[i];
         const auto& name = int_var.symbol->get_name();
         if (i != info.semantics[i].index) {
             throw std::runtime_error("Broken logic.");
         }