From 6c5384a991bb9c161e8251604ad8c838d03a395e Mon Sep 17 00:00:00 2001
From: Levente Bajczi <bajczilevi@gmail.com>
Date: Mon, 11 Nov 2024 17:44:06 +0100
Subject: [PATCH] vars -> globalvars (merge fix)

---
 .../xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/Utils.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/Utils.kt b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/Utils.kt
index 92e025866d..ab6378d3f6 100644
--- a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/Utils.kt
+++ b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/Utils.kt
@@ -261,7 +261,7 @@ private fun XcfaLabel.collectGlobalVars(globalVars: Set<XcfaGlobalVar>): GlobalV
  * second is similar for write access.
  */
 fun XcfaEdge.collectIndirectGlobalVarAccesses(xcfa: XCFA): GlobalVarAccessMap {
-  val globalVars = xcfa.vars
+  val globalVars = xcfa.globalVars
   val flatLabels = getFlatLabels()
   val mutexes =
     flatLabels.filterIsInstance<FenceLabel>().flatMap { it.acquiredMutexes }.toMutableSet()
@@ -293,7 +293,7 @@ fun XcfaEdge.getGlobalVarsWithNeededMutexes(
   xcfa: XCFA,
   currentMutexes: Set<String>,
 ): List<GlobalVarAccessWithMutexes> {
-  val globalVars = xcfa.vars
+  val globalVars = xcfa.globalVars
   val neededMutexes = currentMutexes.toMutableSet()
   val accesses = mutableListOf<GlobalVarAccessWithMutexes>()
   getFlatLabels().forEach { label ->