PR cleanup

Author: awnawab

loki/transformations/hoist_variables.py

@@ -153,10 +153,6 @@ def transform_subroutine(self, routine, **kwargs):
             if not isinstance(child, ProcedureItem):
                 continue
 
-            # skip successors that might have been inlined
-            if not call_map.get(child.local_name, None):
-                continue
-
             arg_map = dict(call_map[child.local_name].arg_iter())
             hoist_variables = []
             for var in child.trafo_data[self._key]["hoist_variables"]:

loki/transformations/inline.py

@@ -15,7 +15,7 @@
 from loki.batch import Transformation
 from loki.ir import (
     Import, Comment, Assignment, VariableDeclaration, CallStatement,
-    Transformer, FindNodes, pragmas_attached, is_loki_pragma, Interface
+    Transformer, FindNodes, pragmas_attached, is_loki_pragma
 )
 from loki.expression import (
     symbols as sym, FindVariables, FindInlineCalls, FindLiterals,
@@ -607,14 +607,14 @@ def inline_marked_subroutines(routine, allowed_aliases=None, adjust_imports=True
                 import_map[impt] = impt.clone(symbols=new_symbols) if new_symbols else None
 
         # Remove explicit interfaces of inlined routines
-        for intf in FindNodes(Interface).visit(routine.ir):
+        for intf in routine.interfaces:
             if not intf.spec:
-                _body = []
-                for s in intf.symbols:
-                    if s.name not in callees or s.name in not_inlined:
-                        _body += [s.type.dtype.procedure,]
+                _body = tuple(
+	                    s.type.dtype.procedure for s in intf.symbols
+	                    if s.name not in callees or s.name in not_inlined
+                )
                 if _body:
-                    import_map[intf] = intf.clone(body=as_tuple(_body))
+                    import_map[intf] = intf.clone(body=_body)
                 else:
                     import_map[intf] = None
 

loki/transformations/single_column/tests/test_single_column_coalesced.py

@@ -1214,7 +1214,7 @@ def test_single_column_coalesced_hoist_nested_inline_openacc(frontend, horizonta
     scc_hoist.apply(inner_kernel, role='kernel', item=inner_kernel_item)
     scc_hoist.apply(
         outer_kernel, role='kernel', item=outer_kernel_item,
-        targets=['compute_q'], successors=(inner_kernel_item,)
+        targets=['compute_q'], successors=()
     )
     scc_hoist.apply(
         driver, role='driver', item=driver_item,