Clear reflection caches in black box codegen tests

To prevent tests from altering outcomes of the subsequent tests.

Also expose the clearCaches method (in the internal class
ReflectionFactoryImpl) so that it can be used in other places in similar
circumstances

Author: udalov

compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
+import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.psi.KtDeclaration;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
@@ -159,6 +160,23 @@ protected void blackBox() {
                 System.out.println(generateToText());
                 throw ExceptionUtilsKt.rethrow(e);
             }
+            finally {
+                clearReflectionCache(generatedClassLoader);
+            }
+        }
+    }
+
+    private static void clearReflectionCache(@NotNull ClassLoader classLoader) {
+        try {
+            Class<?> klass = classLoader.loadClass(JvmAbi.REFLECTION_FACTORY_IMPL.asSingleFqName().asString());
+            Method method = klass.getDeclaredMethod("clearCaches");
+            method.invoke(null);
+        }
+        catch (ClassNotFoundException e) {
+            // This is OK for a test without kotlin-reflect in the dependencies
+        }
+        catch (Exception e) {
+            throw ExceptionUtilsKt.rethrow(e);
         }
     }
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java

@@ -105,4 +105,11 @@ private static KDeclarationContainerImpl getOwner(CallableReference reference) {
         KDeclarationContainer owner = reference.getOwner();
         return owner instanceof KDeclarationContainerImpl ? ((KDeclarationContainerImpl) owner) : EmptyContainerForLocal.INSTANCE;
     }
+
+    // Misc
+
+    public static void clearCaches() {
+        KClassCacheKt.clearKClassCache();
+        ModuleByClassLoaderKt.clearModuleByClassLoaderCache();
+    }
 }

core/reflection.jvm/src/kotlin/reflect/jvm/internal/kClassCache.kt

@@ -64,3 +64,7 @@ internal fun <T : Any> getOrCreateKotlinClass(jClass: Class<T>): KClassImpl<T> {
     K_CLASS_CACHE = K_CLASS_CACHE.plus(name, WeakReference(newKClass))
     return newKClass
 }
+
+internal fun clearKClassCache() {
+    K_CLASS_CACHE = HashPMap.empty()
+}

core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt

@@ -41,7 +41,7 @@ private class WeakClassLoaderBox(classLoader: ClassLoader) {
             identityHashCode
 
     override fun toString() =
-            ref.get()?.let { it.toString() } ?: "<null>"
+            ref.get()?.toString() ?: "<null>"
 }
 
 internal fun Class<*>.getOrCreateModule(): RuntimeModuleData {
@@ -70,3 +70,7 @@ internal fun Class<*>.getOrCreateModule(): RuntimeModuleData {
         key.temporaryStrongRef = null
     }
 }
+
+internal fun clearModuleByClassLoaderCache() {
+    moduleByClassLoader.clear()
+}