More cleanup: lift return / assignment out

2017-07-07 13:57:36 +03:00
parent 9269de721e
commit dfe2c16bc7
116 changed files with 472 additions and 517 deletions
@@ -327,13 +327,13 @@ class JDIEval(
        }

        val obj = instance.jdiObj.checkNull()
-        if (invokespecial) {
+        return if (invokespecial) {
            val method = findMethod(methodDesc)
-            return doInvokeMethod(obj, method, invokePolicy or ObjectReference.INVOKE_NONVIRTUAL)
+            doInvokeMethod(obj, method, invokePolicy or ObjectReference.INVOKE_NONVIRTUAL)
        }
        else {
            val method = findMethod(methodDesc, obj.referenceType() ?: methodDesc.ownerType.asReferenceType())
-            return doInvokeMethod(obj, method, invokePolicy)
+            doInvokeMethod(obj, method, invokePolicy)
        }
    }