diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java index a2e7dccf098..8ad0ea93117 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java @@ -41,7 +41,7 @@ public abstract class CallGenerator { @NotNull ExpressionCodegen codegen ) { if (!callDefault) { - callableMethod.invokeWithNotNullAssertion(codegen.v, codegen.getState(), resolvedCall); + callableMethod.invokeWithoutAssertions(codegen.v); } else { ((CallableMethod)callableMethod).invokeDefaultWithNotNullAssertion(codegen.v, codegen.getState(), resolvedCall); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt index cd114816bb2..bdf08bba2ef 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt @@ -40,8 +40,6 @@ public trait Callable { public val returnType: Type - public fun invokeWithNotNullAssertion(v: InstructionAdapter, state: GenerationState, resolvedCall: ResolvedCall<*>) - public fun invokeWithoutAssertions(v: InstructionAdapter) public fun isStaticCall(): Boolean diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt index 71170f11140..43f573d1061 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt @@ -55,11 +55,6 @@ public class CallableMethod(override val owner: Type, private val defaultImplOwn get() = getAsmMethod().getArgumentTypes() - public override fun invokeWithNotNullAssertion(v: InstructionAdapter, state: GenerationState, resolvedCall: ResolvedCall<*>) { - invokeWithoutAssertions(v) - AsmUtil.genNotNullAssertionForMethod(v, state, resolvedCall) - } - public override fun invokeWithoutAssertions(v: InstructionAdapter) { v.visitMethodInsn(invokeOpcode, owner.getInternalName(), getAsmMethod().getName(), getAsmMethod().getDescriptor()) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index b148983325e..ecc89c9d2d1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -910,7 +910,7 @@ public abstract class StackValue { throw new UnsupportedOperationException("no getter specified"); } - getter.invokeWithNotNullAssertion(v, state, resolvedGetCall); + getter.invokeWithoutAssertions(v); coerceTo(type, v); } @@ -963,7 +963,7 @@ public abstract class StackValue { Type[] argumentTypes = setter.getParameterTypes(); coerce(topOfStackType, argumentTypes[argumentTypes.length - 1], v); - setter.invokeWithNotNullAssertion(v, state, resolvedSetCall); + setter.invokeWithoutAssertions(v); Type returnType = setter.getReturnType(); if (returnType != Type.VOID_TYPE) { pop(v, returnType); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt index a0e33ca9629..635506c9d97 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt @@ -40,10 +40,6 @@ public open class IntrinsicCallable(override val returnType: Type, invokeIntrinsic(v) } - override fun invokeWithNotNullAssertion(v: InstructionAdapter, state: GenerationState, resolvedCall: ResolvedCall) { - invokeWithoutAssertions(v) - } - public open fun invokeIntrinsic(v: InstructionAdapter) { invoke(v) }