Field descriptors fix (#126)

Fix field descriptors and add a test #

Author: sergeypospelov

build.gradle.kts

@@ -268,6 +268,11 @@ fun MavenPublication.addPom() {
                 name.set("Azat Abdullin")
                 email.set("[email protected]")
             }
+            developer {
+                id.set("sergeypospelov")
+                name.set("Sergey Pospelov")
+                email.set("[email protected]")
+            }
             developer {
                 id.set("UnitTestBot")
                 name.set("UnitTestBot Team")

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/JcInstListBuilder.kt

@@ -305,8 +305,7 @@ class JcInstListBuilder(val method: JcMethod,val instList: JcInstList<JcRawInst>
         JcLocalVar(value.name, value.typeName.asType())
 
     override fun visitJcRawFieldRef(value: JcRawFieldRef): JcExpr {
-        val instance = value.instance?.accept(this) as? JcValue
-        val klass = (instance?.type ?: value.declaringClass.asType()) as JcClassType
+        val klass = value.declaringClass.asType() as JcClassType
         val field = klass.findFieldOrNull(value.fieldName)
             ?: throw IllegalStateException("${klass.typeName}#${value.fieldName} not found")
         return JcFieldRef(value.instance?.accept(this) as? JcValue, field)

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/InstructionsTest.kt

@@ -24,17 +24,17 @@ import org.jacodb.api.JcClassProcessingTask
 import org.jacodb.api.JcMethod
 import org.jacodb.api.RegisteredLocation
 import org.jacodb.api.cfg.*
+import org.jacodb.api.ext.*
 import org.jacodb.api.ext.cfg.callExpr
 import org.jacodb.api.ext.cfg.locals
 import org.jacodb.api.ext.cfg.values
-import org.jacodb.api.ext.findClass
-import org.jacodb.api.ext.findMethodOrNull
-import org.jacodb.api.ext.humanReadableSignature
 import org.jacodb.testing.BaseTest
 import org.jacodb.testing.WithDB
 import org.jacodb.testing.cfg.RealMethodResolution.Virtual
 import org.jacodb.testing.cfg.RealMethodResolution.VirtualImpl
+import org.jacodb.testing.structure.FieldsAndMethods
 import org.jacodb.testing.primitives.Primitives
+import org.jacodb.testing.Common
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.DisabledOnJre
@@ -216,6 +216,34 @@ class InstructionsTest : BaseTest() {
         assertEquals(cp.findClass<VirtualImpl>(), actionCallExpr.method.method.enclosingClass)
         assertEquals(cp.findClass<Virtual>(), actionCallExpr.declaredMethod.method.enclosingClass)
     }
+
+    @Test
+    fun `resolving field descriptors should work`() {
+        val parent = cp.findClass<Common.Common1>()
+        val child = cp.findClass<FieldsAndMethods.Common1Child>()
+
+        // public int field
+        val methodWithPublicFieldInt = child.findMethodOrNull("accessIntField")!!
+        val assignInstInt = methodWithPublicFieldInt.instList
+            .filterIsInstance<JcAssignInst>()
+            .single()
+        val fieldInt = (assignInstInt.rhv as JcFieldRef).field
+
+        assertEquals(parent, fieldInt.enclosingType.jcClass)
+        assertEquals(cp.int, fieldInt.fieldType)
+
+
+        // public boolean field
+        val methodWithPublicFieldBoolean = child.findMethodOrNull("accessBooleanField")!!
+        val assignInstBoolean = methodWithPublicFieldBoolean.instList
+            .filterIsInstance<JcAssignInst>()
+            .single()
+        val fieldBoolean = (assignInstBoolean.rhv as JcFieldRef).field
+
+        assertEquals(child, fieldBoolean.enclosingType.jcClass)
+        assertEquals(cp.boolean, fieldBoolean.fieldType)
+    }
+
 }
 
 fun JcMethod.dumpInstructions(): String {

jacodb-core/src/testFixtures/java/org/jacodb/testing/structure/FieldsAndMethods.java

@@ -23,9 +23,18 @@ public class FieldsAndMethods {
     public static class Common1Child extends Common.Common1 {
         private int privateFieldsAndMethods;
 
+        private boolean publicField;
+
         private void privateFieldsAndMethods() {
         }
 
+        private int accessIntField() {
+            return ((Common.Common1) this).publicField;
+        }
+
+        private boolean accessBooleanField() {
+            return publicField;
+        }
     }
 
 }