Dataflow: indirect addressing in CallStatement arguments now handled correctly

Author: awnawab

loki/analyse/analyse_dataflow.py

@@ -232,9 +232,9 @@ def visit_CallStatement(self, o, **kwargs):
             outvals = [val for arg, val in o.arg_iter() if str(arg.type.intent).lower() in ('inout', 'out')]
             invals = [val for arg, val in o.arg_iter() if str(arg.type.intent).lower() in ('inout', 'in')]
 
+            arrays = [v for v in FindVariables().visit(outvals) if isinstance(v, Array)]
+            dims = set(v for a in arrays for v in self._symbols_from_expr(a.dimensions))
             for val in outvals:
-                arrays = [v for v in FindVariables().visit(outvals) if isinstance(v, Array)]
-                dims = set(v for a in arrays for v in FindVariables().visit(a.dimensions))
                 exprs = self._symbols_from_expr(val)
                 defines |= {e for e in exprs if not e in dims}
                 uses |= dims

loki/analyse/tests/test_analyse_dataflow.py

@@ -464,26 +464,30 @@ def test_analyse_call_args_array_slicing(frontend):
 
 end subroutine random_call
 
-subroutine test(v,n)
+subroutine test(v,n,b)
 implicit none
 
   integer,intent(out) :: v(:)
   integer,intent( in) :: n
+  integer,intent( in) :: b(n)
 
   call random_call(v(n))
+  call random_call(v(b(1)))
 
 end subroutine test
     """.strip()
 
     source = Sourcefile.from_source(fcode, frontend=frontend)
     routine = source['test']
 
-    call = FindNodes(CallStatement).visit(routine.body)[0]
+    calls = FindNodes(CallStatement).visit(routine.body)
     routine.enrich(source.all_subroutines)
 
     with dataflow_analysis_attached(routine):
-        assert 'n' in call.uses_symbols
-        assert not 'n' in call.defines_symbols
+        assert 'n' in calls[0].uses_symbols
+        assert not 'n' in calls[0].defines_symbols
+        assert 'b' in calls[1].uses_symbols
+        assert not 'b' in calls[0].defines_symbols
 
 
 @pytest.mark.parametrize('frontend', available_frontends())