Fix finding free variables

effekt-lang · Jan 10, 2025 · cdea340 · cdea340
1 parent 3cbf9cf
commit cdea340
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/effekt/shared/src/main/scala/effekt/generator/llvm/Transformer.scala b/effekt/shared/src/main/scala/effekt/generator/llvm/Transformer.scala
@@ -110,15 +110,14 @@ object Transformer {
 
       case machine.Switch(value, clauses, default) =>
         emit(Comment(s"switch ${value.name}, ${clauses.length} clauses"))
-        shareValues(List(value), clauses.flatMap(freeVariables).toSet)
+        val freeInClauses = clauses.flatMap(freeVariables) ++ default.map(freeVariables).getOrElse(Set.empty)
+        shareValues(List(value), freeInClauses.toSet)
 
         val tagName = freshName("tag")
         val objectName = freshName("fields")
         emit(ExtractValue(tagName, transform(value), 0))
         emit(ExtractValue(objectName, transform(value), 1))
 
-        val freeInClauses = clauses.flatMap(freeVariables)
-
         val stack = getStack()
         def labelClause(clause: machine.Clause): String = {
           implicit val BC = BlockContext()

diff --git a/effekt/shared/src/main/scala/effekt/machine/Analysis.scala b/effekt/shared/src/main/scala/effekt/machine/Analysis.scala
@@ -24,7 +24,7 @@ def freeVariables(statement: Statement): Set[Variable] =
     case Construct(name, tag, values, rest) =>
       Set.from(values) ++ (freeVariables(rest) -- Set(name))
     case Switch(value, clauses, default: Option[Clause]) =>
-      Set(value) ++ clauses.flatMap { case (tag, branch) => freeVariables(branch) } ++ default.map(freeVariables).getOrElse(Set.empty)
+      Set(value) ++ clauses.flatMap(freeVariables) ++ default.map(freeVariables).getOrElse(Set.empty)
     case New(name, clauses, rest) =>
       freeVariables(clauses) ++ (freeVariables(rest) -- Set(name))
     case Invoke(value, tag, values) =>