Transform: Correctly (re-)attach scopes and use after inlining

This is needed to correctly infer parentage among scoped IR nodes
is they have been moved (eg. via inlining associates).

loki/expression/expr_visitors.py

@@ -339,6 +339,11 @@ def visit_Scope(self, o, **kwargs):
         # entry in the scope's table
         self._update_symbol_table_with_decls_and_imports(o)
 
+        # Attach parent scope if it is new before passing self down to children
+        parent_scope = kwargs.get('scope', o.parent)
+        if o.parent is not parent_scope and o is not parent_scope:
+            o._reset_parent(parent=parent_scope)
+
         # Then recurse to all children
         kwargs['scope'] = o
         children = tuple(self.visit(i, **kwargs) for i in o.children)

loki/scope.py

@@ -297,7 +297,7 @@ def rescope_symbols(self):
         to a scope in the scope hierarchy
         """
         from loki.expression import AttachScopes  # pylint: disable=import-outside-toplevel,cyclic-import
-        AttachScopes().visit(self)
+        AttachScopes().visit(self, scope=self)
 
     def make_complete(self, **frontend_args):
         """

loki/transform/transform_inline.py

@@ -498,6 +498,10 @@ def inline_subroutine_calls(routine, calls, callee, allowed_aliases=None):
     # Replace calls to child procedure with the child's body
     routine.body = Transformer(call_map).visit(routine.body)
 
+    # We need this to ensure that symbols, as well as nested scopes
+    # are correctly attached to each other (eg. nested associates).
+    routine.rescope_symbols()
+
 
 def inline_internal_procedures(routine, allowed_aliases=None):
     """