From 51a5bf9f7e3865d3b7152ff807a95120b208b94e Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 14 Nov 2016 11:56:45 +0300 Subject: [PATCH] Minor. Drop redundant parameters of 'inferReturnTypeFromExpressionBody' Both storageManager and expressionTypingServices must be the same instances inside the resolution session and can be obtained from the DescriptorResolver fields --- .../org/jetbrains/kotlin/resolve/DescriptorResolver.java | 6 +----- .../jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 33c279194e6..9f6dbb5325c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -1017,9 +1017,7 @@ public class DescriptorResolver { KtProperty property = getter.getProperty(); if (!property.hasDelegateExpressionOrInitializer() && property.getTypeReference() == null && getter.hasBody() && !getter.hasBlockBody()) { - return inferReturnTypeFromExpressionBody( - storageManager, expressionTypingServices, trace, scope, DataFlowInfoFactory.EMPTY, getter, getterDescriptor - ); + return inferReturnTypeFromExpressionBody(trace, scope, DataFlowInfoFactory.EMPTY, getter, getterDescriptor); } return propertyType; @@ -1027,8 +1025,6 @@ public class DescriptorResolver { @NotNull /*package*/ DeferredType inferReturnTypeFromExpressionBody( - @NotNull StorageManager storageManager, - @NotNull final ExpressionTypingServices expressionTypingServices, @NotNull final BindingTrace trace, @NotNull final LexicalScope scope, @NotNull final DataFlowInfo dataFlowInfo, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index 93af33ff529..cfe15d628cc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -128,8 +128,7 @@ class FunctionDescriptorResolver( builtIns.unitType } else if (function.hasBody()) { - descriptorResolver.inferReturnTypeFromExpressionBody(storageManager, expressionTypingServices, trace, scope, - dataFlowInfo, function, functionDescriptor) + descriptorResolver.inferReturnTypeFromExpressionBody(trace, scope, dataFlowInfo, function, functionDescriptor) } else { ErrorUtils.createErrorType("No type, no body")