Merge branch 'master' of github.com:nevillegrech/gigahorse-toolchain

nevillegrech · Jun 27, 2024 · a648c13 · a648c13
2 parents 1711f36 + ab50441
commit a648c13
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/clientlib/memory_modeling/arrays.dl b/clientlib/memory_modeling/arrays.dl
@@ -1148,17 +1148,17 @@ VarPointsToArray(ctx, arrayVar, ctx, arrayId):-
   ArrayAllocation(arrayId, _, _).
 
 VarPointsToArray(newCtx, formal, heapCtx, arrayId):-
-  clientCtx.MergeClientContext(callerCtx, caller, newCtx),
   VarPointsToArray(callerCtx, actual, heapCtx, arrayId),
+  clientCtx.MergeClientContext(callerCtx, caller, newCtx),
   ActualArgs(caller, actual, pos),
   CallGraphEdge(caller, function),
   FormalArgs(function, formal, pos).
 
 VarPointsToArray(callerCtx, actual, heapCtx, arrayId):-
+  VarPointsToArray(calleeCtx, formal, heapCtx, arrayId),
   clientCtx.MergeClientContext(callerCtx, caller, calleeCtx),
   CallGraphEdge(caller, function),
   FormalReturnArgs(function, formal, index),
-  VarPointsToArray(calleeCtx, formal, heapCtx, arrayId),
   ActualReturnArgs(caller, actual, index).
 
 InsVarPointsToArray(var, arrayId):-