From 01a6e7abf31c12c09a74f33067568f687bf72816 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 24 Dec 2019 20:09:32 +0900
Subject: [PATCH] Debugger, eval4j: Remove eager class loading in findField()
 (KT-35354)

---
 .../eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
index 3a65deec9ec..a54768a1270 100644
--- a/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
+++ b/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
@@ -173,9 +173,8 @@ open class JDIEval(
     }
 
     private fun findField(fieldDesc: FieldDescription, receiver: ReferenceType? = null): Field {
-        for (owner in listOfNotNull(receiver, fieldDesc.ownerType.asReferenceType())) {
-            owner.fieldByName(fieldDesc.name)?.let { return it }
-        }
+        receiver?.fieldByName(fieldDesc.name)?.let { return it }
+        fieldDesc.ownerType.asReferenceType().fieldByName(fieldDesc.name)?.let { return it }
 
         throwBrokenCodeException(NoSuchFieldError("Field not found: $fieldDesc"))
     }