Merge pull request #448 from Caparow/scala2-feature-clean-thread-locals-causing-oom

adamw · web-flow · commit b7ee4aae59f5 · 2023-01-14T11:36:46.000+01:00
Removing ThreadLocals on finish to clean up CompileTimeStack.
diff --git a/core/src/main/scala/magnolia1/magnolia.scala b/core/src/main/scala/magnolia1/magnolia.scala
@@ -903,8 +903,8 @@ private[magnolia1] object CompileTimeState {
       val depth = c.enclosingMacros.count(m => workSet(m.macroApplication.symbol))
       try fn(stack.asInstanceOf[Stack[c.type]], depth)
       finally if (depth <= 1) {
-        stack.clear()
-        workSet.clear()
+        threadLocalStack.remove()
+        threadLocalWorkSet.remove()
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -903,8 +903,8 @@ private[magnolia1] object CompileTimeState {`
`903`	`903`	`val depth = c.enclosingMacros.count(m => workSet(m.macroApplication.symbol))`
`904`	`904`	`try fn(stack.asInstanceOf[Stack[c.type]], depth)`
`905`	`905`	`finally if (depth <= 1) {`
`906`		`- stack.clear()`
`907`		`- workSet.clear()`
	`906`	`+ threadLocalStack.remove()`
	`907`	`+ threadLocalWorkSet.remove()`
`908`	`908`	`}`
`909`	`909`	`}`
`910`	`910`	`}`