From ede9ca43feaa52496ab38bd2d247127b13c53f2f Mon Sep 17 00:00:00 2001
From: Levente Bajczi <bajczilevi@gmail.com>
Date: Thu, 2 Nov 2023 14:14:53 +0100
Subject: [PATCH] Fixed merge problem

---
 .../theta/xcfa/passes/ProcedurePassManager.kt | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/passes/ProcedurePassManager.kt b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/passes/ProcedurePassManager.kt
index 0c49556c13..2b13530304 100644
--- a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/passes/ProcedurePassManager.kt
+++ b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/passes/ProcedurePassManager.kt
@@ -61,16 +61,16 @@ class CPasses(checkOverflow: Boolean, parseContext: ParseContext) : ProcedurePas
     )
 )
 
-class ChcPasses : ProcedurePassManager(/*listOf(
-        // formatting
-        NormalizePass(),
-        DeterministicPass(),
-        // removing redundant elements
-        EmptyEdgeRemovalPass(),
-        UnusedLocRemovalPass(),
-        // optimizing
-        SimplifyExprsPass(),
-        // handling intrinsics
+class ChcPasses(parseContext: ParseContext) : ProcedurePassManager(listOf(
+    // formatting
+    NormalizePass(parseContext),
+    DeterministicPass(parseContext),
+    // removing redundant elements
+    EmptyEdgeRemovalPass(parseContext),
+    UnusedLocRemovalPass(parseContext),
+    // optimizing
+    SimplifyExprsPass(parseContext),
+    // handling intrinsics
 //        ErrorLocationPass(false),
 //        FinalLocationPass(false),
 //        SvCompIntrinsicsPass(),