Don't disable pickling tests for #4192

Author: prolativ

compiler/test/dotc/run-test-pickling.blacklist

@@ -1,7 +1,6 @@
 derive-generic.scala
 eff-dependent.scala
 enum-java
-i4192
 i5257.scala
 i7212
 i7868.scala

tests/run/i4192/Checks.scala

@@ -2,17 +2,7 @@ package checks
 
 import reflect.ClassTag
 
-/* This test checks whether InnerClasses and EnclosingMethod sections in generated class files are correct
- * for different possibilities of nesting of classes in other classes, objects and methods (the attributes are accessed via java reflection).
- * Names of nested definitions are derived from the name of their enclosing definition by appending a letter following the scheme below:
- * A - a class without a companion object
- * B - an object without a companion class
- * C - a class with its companion object
- * D - a method
- * Additionally a number may be added to avoid clashes between definitions from classes and their companion objects
- * (1 - defined in the companion class; 2 - defined in the companion object),
- * e.g. ACD2 - a method inside the companion object of a class inside a top level class
- */
+
 trait Checks:
   val expectedTopLevelChecksCount: Int
   val expectedMemberChecksCount: Int
@@ -30,22 +20,25 @@ trait Checks:
     assert(localChecksCount == expectedLocalChecksCount,
       s"local checks: expected $expectedLocalChecksCount but was $localChecksCount")
 
+  // The methods below rely on the naming convention described in TestCases.scala
+
   /** Check JVM class properties of a top level class */
-  def checkTopLevel[ThisClass](using thisTag: ClassTag[ThisClass]) =
-    val cls = thisTag.runtimeClass
+  def checkTopLevel(self: AnyRef) =
+    val cls = self.getClass
     assert(cls.getEnclosingClass == null, s"Top level class $cls should have no enclosing class")
     assert(cls.getDeclaringClass == null, s"Top level class $cls should have no declaring class")
     assert(cls.getEnclosingMethod == null, s"Top level class $cls should have no enclosing method")
     topLevelChecksCount += 1
 
   /** Check JVM class properties of a member class (defined directly inside another class) */
-  def checkMember[ThisClass, EnclosingClass](using thisTag: ClassTag[ThisClass], enclosingTag: ClassTag[EnclosingClass]) =
-    val cls = thisTag.runtimeClass
+  def checkMember(self: AnyRef, outer: AnyRef) =
+    val cls = self.getClass
     def className = cls.simpleName
     def enclosingClassName = cls.getEnclosingClass.simpleName
     def declaringClassName = cls.getDeclaringClass.simpleName
-    val expectedEnclosingClassName = enclosingTag.runtimeClass.simpleName match
-      case "B$" => "B" // classes defined directly in top level objects should be moved to their companion/mirror classes
+    // Classes defined directly in top level objects should be moved to their companion/mirror classes
+    val expectedEnclosingClassName = outer.getClass.simpleName match
+      case "B$" => "B"
       case "C$" => "C"
       case name => name
     assert(cls.getEnclosingClass != null,
@@ -59,12 +52,12 @@ trait Checks:
     memberChecksCount += 1
 
   /** Check JVM class properties of a local class (defined directly inside a method) */
-  def checkLocal[ThisClass, EnclosingClass](using thisTag: ClassTag[ThisClass], enclosingTag: ClassTag[EnclosingClass]) =
-    val cls = thisTag.runtimeClass
+  def checkLocal(self: AnyRef, outer: AnyRef) =
+    val cls = self.getClass
     def className = cls.simpleName
     def enclosingClassName = cls.getEnclosingClass.simpleName
-    def meth = cls.getEnclosingMethod
-    val expectedEnclosingClassName = enclosingTag.runtimeClass.simpleName
+    def method = cls.getEnclosingMethod
+    val expectedEnclosingClassName = outer.getClass.simpleName
     // extracting method name basing on the described naming convention
     // $1 gets added during lambdaLift in case of a method defined inside another method
     val expectedEnclosingMethodName =
@@ -77,10 +70,10 @@ trait Checks:
       s"The enclosing class of class $className should be $expectedEnclosingClassName but was $enclosingClassName")
     assert(cls.getDeclaringClass == null,
       s"Local class $className should have no declaring class")
-    assert(meth != null,
+    assert(method != null,
       s"Local class $className should have an enclosing method")
-    assert(meth.getName == expectedEnclosingMethodName,
-      s"The enclosing method of class $className should be $expectedEnclosingMethodName but was ${meth.getName}")
+    assert(method.getName == expectedEnclosingMethodName,
+      s"The enclosing method of class $className should be $expectedEnclosingMethodName but was ${method.getName}")
     localChecksCount += 1
 
   extension (cls: Class[?])