Added removal of access$get and access$set synthetic field access trace points.

Author: bbrockbernd

src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/TracePoint.kt

@@ -73,7 +73,7 @@ internal class SwitchEventTracePoint(
 internal abstract class CodeLocationTracePoint(
     iThread: Int, actorId: Int,
     callStackTrace: CallStackTrace,
-    val stackTraceElement: StackTraceElement
+    var stackTraceElement: StackTraceElement
 ) : TracePoint(iThread, actorId, callStackTrace) {
 
     protected abstract fun toStringCompact(): String

src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/TraceReporter.kt

@@ -380,10 +380,31 @@ internal fun constructTraceGraph(
     return traceGraphNodesSections.map { it.first() }
 }
 
-private fun compressTrace(trace: List<TracePoint>) =
+private fun compressTrace(trace: List<TracePoint>) {
+    removeSyntheticFieldAccessTracePoints(trace)
     HashSet<Int>().let { removed ->
-        trace.apply {  forEach { it.callStackTrace = compressCallStackTrace(it.callStackTrace, removed) } } 
+        trace.apply { forEach { it.callStackTrace = compressCallStackTrace(it.callStackTrace, removed) } }
     }
+}
+
+/**
+ * Remove access$get and access$set, which is used when a lambda argument accesses a private field for example.
+ * This is different from fun$access, which is addressed in [compressCallStackTrace].
+ */
+private fun removeSyntheticFieldAccessTracePoints(trace: List<TracePoint>) {
+    trace
+        .filter { it is ReadTracePoint || it is WriteTracePoint }
+        .forEach { point ->
+            val lastCall = point.callStackTrace.last()
+            if (lastCall.tracePoint.methodName.contains("access\$get")
+                || lastCall.tracePoint.methodName.contains("access\$set")) {
+                val secondLast = lastCall.tracePoint.callStackTrace.last()
+                if (point is ReadTracePoint) point.stackTraceElement = secondLast.tracePoint.stackTraceElement
+                if (point is WriteTracePoint) point.stackTraceElement = secondLast.tracePoint.stackTraceElement
+                point.callStackTrace = point.callStackTrace.dropLast(1)
+            }
+        }
+}
 
 /**
  * Merges fun$default(...) calls.

src/jvm/test/org/jetbrains/kotlinx/lincheck_test/representation/AccessFunctionRepresentationTest.kt

@@ -37,4 +37,15 @@ class AccessFunctionRepresentationTest: BaseRunConcurrentRepresentationTest<Unit
 
 fun runn(r: () -> Unit) {
     r()
-}
+}
+
+class AccessFieldRepresentationTest: BaseRunConcurrentRepresentationTest<Unit>("access_field_representation_test.txt") {
+
+    @Volatile
+    private var a = 0
+    
+    override fun block() {
+        runn { a++ }
+        check(false)
+    }
+}

src/jvm/test/resources/expected_logs/access_field_representation_test.txt

@@ -0,0 +1,28 @@
+= Concurrent test failed =
+
+java.lang.IllegalStateException: Check failed.
+	at org.jetbrains.kotlinx.lincheck_test.representation.AccessFieldRepresentationTest.block(AccessFunctionRepresentationTest.kt:49)
+	at org.jetbrains.kotlinx.lincheck_test.representation.AccessFieldRepresentationTest.block(AccessFunctionRepresentationTest.kt:42)
+	at org.jetbrains.kotlinx.lincheck_test.representation.BaseRunConcurrentRepresentationTest$testRunWithModelChecker$result$1$1.invoke(RunConcurrentRepresentationTests.kt:40)
+	at java.base/java.lang.Thread.run(Thread.java:840)
+
+The following interleaving leads to the error:
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|                                                                                           Thread 1                                                                                            |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| AccessFieldRepresentationTest#1.block(): threw IllegalStateException at BaseRunConcurrentRepresentationTest$testRunWithModelChecker$result$1$1.invoke(RunConcurrentRepresentationTests.kt:40) |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+
+Detailed trace:
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|                                                                                           Thread 1                                                                                            |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| AccessFieldRepresentationTest#1.block(): threw IllegalStateException at BaseRunConcurrentRepresentationTest$testRunWithModelChecker$result$1$1.invoke(RunConcurrentRepresentationTests.kt:40) |
+|   block(): threw IllegalStateException at AccessFieldRepresentationTest.block(AccessFunctionRepresentationTest.kt:42)                                                                         |
+|     AccessFunctionRepresentationTestKt.runn(block$1) at AccessFieldRepresentationTest.block(AccessFunctionRepresentationTest.kt:48)                                                           |
+|       block$1.invoke() at AccessFunctionRepresentationTestKt.runn(AccessFunctionRepresentationTest.kt:39)                                                                                     |
+|         invoke() at AccessFieldRepresentationTest$block$1.invoke(AccessFunctionRepresentationTest.kt:48)                                                                                      |
+|           AccessFieldRepresentationTest#1.a ➜ 1 at AccessFieldRepresentationTest$block$1.invoke(AccessFunctionRepresentationTest.kt:48)                                                       |
+|           AccessFieldRepresentationTest#1.a = 2 at AccessFieldRepresentationTest$block$1.invoke(AccessFunctionRepresentationTest.kt:48)                                                       |
+|   result: IllegalStateException #1                                                                                                                                                            |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |