Fixed review issues

Author: Damtev

utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt

@@ -88,6 +88,7 @@ import org.utbot.engine.symbolic.asUpdate
 import org.utbot.engine.simplificators.MemoryUpdateSimplificator
 import org.utbot.engine.simplificators.simplifySymbolicStateUpdate
 import org.utbot.engine.simplificators.simplifySymbolicValue
+import org.utbot.engine.types.CLASS_REF_SOOT_CLASS
 import org.utbot.engine.types.CLASS_REF_TYPE
 import org.utbot.engine.types.ENUM_ORDINAL
 import org.utbot.engine.types.EQUALS_SIGNATURE
@@ -423,8 +424,11 @@ class Traverser(
     private fun TraversalContext.pushInitGraphAfterNewInstanceReflectionCall(stmt: JAssignStmt): Boolean {
         // Check whether the previous stmt was a `newInstance` invocation
         val lastStmt = environment.state.path.lastOrNull() as? JAssignStmt ?: return false
-        val lastStmtRight = lastStmt.rightOp as? JVirtualInvokeExpr ?: return false
-        val lastMethodInvocation = lastStmtRight.retrieveMethod()
+        if (!lastStmt.containsInvokeExpr()) {
+            return false
+        }
+
+        val lastMethodInvocation = lastStmt.invokeExpr.method
         if (lastMethodInvocation.subSignature != NEW_INSTANCE_SIGNATURE) {
             return false
         }
@@ -2963,8 +2967,9 @@ class Traverser(
             }
         }
 
-        // Return an unbounded symbolic variable for any `forName` overloading
-        if (instance == null && invocation.method.name == "forName") {
+        // Return an unbounded symbolic variable for any overloading of method `forName` of class `java.lang.Class`
+        // NOTE: we cannot match by a subsignature here since `forName` method has a few overloadings
+        if (instance == null && invocation.method.declaringClass == CLASS_REF_SOOT_CLASS && invocation.method.name == "forName") {
             val forNameResult = unboundedVariable(name = "classForName", invocation.method)
 
             return OverrideResult(success = true, forNameResult)

utbot-framework/src/main/kotlin/org/utbot/engine/types/TypeResolver.kt

@@ -39,6 +39,7 @@ import soot.NullType
 import soot.PrimType
 import soot.RefType
 import soot.Scene
+import soot.SootClass
 import soot.SootField
 import soot.Type
 import soot.VoidType
@@ -344,7 +345,8 @@ internal val CLASS_REF_NUM_DIMENSIONS_DESCRIPTOR: MemoryChunkDescriptor
         IntType.v()
     )
 
-internal val CLASS_REF_SOOT_CLASS = Scene.v().getSootClass(CLASS_REF_CLASSNAME)
+internal val CLASS_REF_SOOT_CLASS: SootClass
+    get() = Scene.v().getSootClass(CLASS_REF_CLASSNAME)
 
 internal val OBJECT_TYPE: RefType
     get() = Scene.v().getSootClass(Object::class.java.canonicalName).type