From 47439603bb3a52890ccfe6689f3969b840be0e91 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 5 Aug 2015 19:04:06 +0300 Subject: [PATCH] Minor, delete useless instanceof A follow-up to 9b832d4 --- .../src/org/jetbrains/kotlin/resolve/OverrideResolver.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index fb15707fb0f..c1f3e4d36f9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java @@ -841,10 +841,8 @@ public class OverrideResolver { @NotNull ValueParameterDescriptor parameterFromSubclass, @NotNull ValueParameterDescriptor parameterFromSuperclass ) { - DeclarationDescriptor subFunction = parameterFromSubclass.getContainingDeclaration(); - DeclarationDescriptor superFunction = parameterFromSuperclass.getContainingDeclaration(); - return subFunction instanceof CallableDescriptor && ((CallableDescriptor) subFunction).hasStableParameterNames() && - superFunction instanceof CallableDescriptor && ((CallableDescriptor) superFunction).hasStableParameterNames() && + return parameterFromSubclass.getContainingDeclaration().hasStableParameterNames() && + parameterFromSuperclass.getContainingDeclaration().hasStableParameterNames() && !parameterFromSuperclass.getName().equals(parameterFromSubclass.getName()); }