Fixes to SDFG inlining for structures

dace/transformation/interstate/sdfg_nesting.py

@@ -427,11 +427,26 @@ def apply(self, state: SDFGState, sdfg: SDFG):
 
         orig_data: Dict[Union[nodes.AccessNode, MultiConnectorEdge], str] = {}
         for node in nstate.nodes():
-            if isinstance(node, nodes.AccessNode) and node.data in repldict:
-                orig_data[node] = node.data
-                node.data = repldict[node.data]
+            if isinstance(node, nodes.AccessNode):
+                if '.' in node.data:
+                    parts = node.data.split('.')
+                    root_container = parts[0]
+                    if root_container in repldict:
+                        orig_data[node] = node.data
+                        full_data = [repldict[root_container]] + parts[1:]
+                        node.data = '.'.join(full_data)
+                elif node.data in repldict:
+                    orig_data[node] = node.data
+                    node.data = repldict[node.data]
         for edge in nstate.edges():
-            if edge.data.data in repldict:
+            if '.' in edge.data.data:
+                parts = edge.data.data.split('.')
+                root_container = parts[0]
+                if root_container in repldict:
+                    orig_data[edge] = edge.data.data
+                    full_data = [repldict[root_container]] + parts[1:]
+                    edge.data.data = '.'.join(full_data)
+            elif edge.data.data in repldict:
                 orig_data[edge] = edge.data.data
                 edge.data.data = repldict[edge.data.data]
 

dace/transformation/passes/lift_struct_views.py

@@ -16,6 +16,8 @@
 
 
 import sys
+
+from dace.transformation.transformation import explicit_cf_compatible
 if sys.version_info >= (3, 8):
     from typing import Literal
     dirtype = Literal['in', 'out']
@@ -348,6 +350,7 @@ def _data_containers_in_ast(node: ast.AST, arrnames: Set[str]) -> Set[str]:
                 result.add(data)
     return result
 
+@explicit_cf_compatible
 class LiftStructViews(ppl.Pass):
     """
     Lift direct accesses to struct members to accesses to views pointing to that struct member.