Clean up threadlocals after processing

hfmehmed · KSP Auto Pick · commit 57d9c240f055 · 2025-11-27T15:36:47.000Z
(cherry picked from commit 37ceb5a)
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
@@ -615,6 +615,7 @@ class KotlinSymbolProcessing(
         } finally {
             maybeRunInWriteAction {
                 Disposer.dispose(projectDisposable)
+                ResolverAAImpl.tearDown()
             }
         }
 
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/ResolverAAImpl.kt
@@ -85,6 +85,11 @@ class ResolverAAImpl(
             set(value) {
                 ktModule_prop.set(value)
             }
+
+        fun tearDown() {
+            instance_prop.remove()
+            ktModule_prop.remove()
+        }
     }
     lateinit var propertyAsMemberOfCache: MutableMap<Pair<KSPropertyDeclaration, KSType>, KSType>
     lateinit var functionAsMemberOfCache: MutableMap<Pair<KSFunctionDeclaration, KSType>, KSFunction>

Original file line number	Diff line number	Diff line change
`@@ -615,6 +615,7 @@ class KotlinSymbolProcessing(`
`615`	`615`	`} finally {`
`616`	`616`	`maybeRunInWriteAction {`
`617`	`617`	`Disposer.dispose(projectDisposable)`
	`618`	`+ ResolverAAImpl.tearDown()`
`618`	`619`	`}`
`619`	`620`	`}`
`620`	`621`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,11 @@ class ResolverAAImpl(`
`85`	`85`	`set(value) {`
`86`	`86`	`ktModule_prop.set(value)`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ fun tearDown() {`
	`90`	`+ instance_prop.remove()`
	`91`	`+ ktModule_prop.remove()`
	`92`	`+ }`
`88`	`93`	`}`
`89`	`94`	`lateinit var propertyAsMemberOfCache: MutableMap<Pair<KSPropertyDeclaration, KSType>, KSType>`
`90`	`95`	`lateinit var functionAsMemberOfCache: MutableMap<Pair<KSFunctionDeclaration, KSType>, KSFunction>`