Fix reference to local variable.

src/codegen/codegen_cpp_visitor.cpp

@@ -4060,7 +4060,7 @@ void CodegenCppVisitor::visit_for_netcon(const ast::ForNetcon& node) {
     // to the next netcon.
     const auto& args = node.get_parameters();
     RenameVisitor v;
-    auto& statement_block = node.get_statement_block();
+    const auto& statement_block = node.get_statement_block();
     for (size_t i_arg = 0; i_arg < args.size(); ++i_arg) {
         // sanitize node_name since we want to substitute names like (*w) as they are
         auto old_name =

src/language/nodes.py

@@ -234,11 +234,15 @@ def member_typename(self):
 
         return type_name
 
+    @property
+    def _is_member_type_wrapped_as_shared_pointer(self):
+        return not (self.is_vector or self.is_base_type_node or self.is_ptr_excluded_node)
+
     @property
     def member_rvalue_typename(self):
         """returns rvalue reference type when used as returned or parameter type"""
         typename = self.member_typename
-        if not self.is_integral_type_node:
+        if not self.is_integral_type_node and not self._is_member_type_wrapped_as_shared_pointer:
             return "const " + typename + "&"
         return typename
 

src/language/templates/ast/ast.cpp

@@ -30,7 +30,7 @@ std::string Ast::get_node_name() const {
   throw std::logic_error("get_node_name() not implemented");
 }
 
-const std::shared_ptr<StatementBlock>& Ast::get_statement_block() const {
+std::shared_ptr<StatementBlock> Ast::get_statement_block() const {
   throw std::runtime_error("get_statement_block not implemented");
 }
 

src/language/templates/ast/ast.hpp

@@ -273,7 +273,7 @@ struct Ast: public std::enable_shared_from_this<Ast> {
    *
    * \sa ast::StatementBlock
    */
-  virtual const std::shared_ptr<StatementBlock>& get_statement_block() const;
+  virtual std::shared_ptr<StatementBlock> get_statement_block() const;
 
   /**
    * \brief Set symbol table for the AST node

src/language/templates/pybind/pyast.hpp

@@ -114,8 +114,8 @@ struct PyAst: public Ast {
         PYBIND11_OVERRIDE(symtab::SymbolTable*, Ast, get_symbol_table, );
     }
 
-    const std::shared_ptr<StatementBlock>& get_statement_block() const override {
-        PYBIND11_OVERRIDE(const std::shared_ptr<StatementBlock>&, Ast, get_statement_block, );
+    std::shared_ptr<StatementBlock> get_statement_block() const override {
+        PYBIND11_OVERRIDE(std::shared_ptr<StatementBlock>, Ast, get_statement_block, );
     }
 
     void set_symbol_table(symtab::SymbolTable* newsymtab) override {

src/visitors/global_var_visitor.cpp

@@ -25,7 +25,7 @@ void GlobalToRangeVisitor::visit_neuron_block(ast::NeuronBlock& node) {
     std::unordered_set<ast::GlobalVar*> global_variables_to_remove;
     std::unordered_set<ast::Statement*> global_statements_to_remove;
 
-    auto& statement_block = node.get_statement_block();
+    auto const& statement_block = node.get_statement_block();
     auto& statements = (*statement_block).get_statements();
     const auto& symbol_table = ast.get_symbol_table();
 

src/visitors/neuron_solve_visitor.cpp

@@ -32,7 +32,7 @@ void NeuronSolveVisitor::visit_derivative_block(ast::DerivativeBlock& node) {
     node.visit_children(*this);
     derivative_block = false;
     if (solve_blocks[derivative_block_name] == codegen::naming::EULER_METHOD) {
-        auto& statement_block = node.get_statement_block();
+        const auto& statement_block = node.get_statement_block();
         for (auto& e: euler_solution_expressions) {
             statement_block->emplace_back_statement(e);
         }