From 7abbf1ec120d4caba63e45ab57769be6220df082 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 7 Apr 2015 12:02:44 +0300 Subject: [PATCH] Rename invokeWithout assertion to genInvokeInstruction --- .../src/org/jetbrains/kotlin/codegen/AsmUtil.java | 11 ----------- .../org/jetbrains/kotlin/codegen/CallGenerator.java | 6 +++--- .../src/org/jetbrains/kotlin/codegen/Callable.kt | 2 +- .../org/jetbrains/kotlin/codegen/CallableMethod.kt | 9 ++------- .../kotlin/codegen/ImplementationBodyCodegen.java | 2 +- .../kotlin/codegen/PlatformStaticGenerator.kt | 2 +- .../src/org/jetbrains/kotlin/codegen/StackValue.java | 8 ++++---- .../kotlin/codegen/intrinsics/IntrinsicCallable.kt | 2 +- 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index c41b0bc3fb8..3ab39633f1c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -628,17 +628,6 @@ public class AsmUtil { genNotNullAssertion(v, state, descriptor, "checkFieldIsNotNull"); } - public static void genNotNullAssertionForMethod( - @NotNull InstructionAdapter v, - @NotNull GenerationState state, - @NotNull ResolvedCall resolvedCall - ) { - CallableDescriptor descriptor = resolvedCall.getResultingDescriptor(); - if (descriptor instanceof ConstructorDescriptor) return; - - genNotNullAssertion(v, state, descriptor, "checkReturnedValueIsNotNull"); - } - private static void genNotNullAssertion( @NotNull InstructionAdapter v, @NotNull GenerationState state, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java index 8ad0ea93117..17c148492a2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java @@ -41,10 +41,10 @@ public abstract class CallGenerator { @NotNull ExpressionCodegen codegen ) { if (!callDefault) { - callableMethod.invokeWithoutAssertions(codegen.v); + callableMethod.genInvokeInstruction(codegen.v); } else { - ((CallableMethod)callableMethod).invokeDefaultWithNotNullAssertion(codegen.v, codegen.getState(), resolvedCall); + ((CallableMethod)callableMethod).genInvokeDefaultInstruction(codegen.v); } } @@ -52,7 +52,7 @@ public abstract class CallGenerator { public void genCallWithoutAssertions( @NotNull CallableMethod method, @NotNull ExpressionCodegen codegen ) { - method.invokeWithoutAssertions(codegen.v); + method.genInvokeInstruction(codegen.v); } @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt index bdf08bba2ef..95d8bd11be9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt @@ -40,7 +40,7 @@ public trait Callable { public val returnType: Type - public fun invokeWithoutAssertions(v: InstructionAdapter) + public fun genInvokeInstruction(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 43f573d1061..1ffed721103 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt @@ -55,11 +55,11 @@ public class CallableMethod(override val owner: Type, private val defaultImplOwn get() = getAsmMethod().getArgumentTypes() - public override fun invokeWithoutAssertions(v: InstructionAdapter) { + public override fun genInvokeInstruction(v: InstructionAdapter) { v.visitMethodInsn(invokeOpcode, owner.getInternalName(), getAsmMethod().getName(), getAsmMethod().getDescriptor()) } - private fun invokeDefault(v: InstructionAdapter) { + public fun genInvokeDefaultInstruction(v: InstructionAdapter) { if (defaultImplOwner == null || defaultImplParam == null) { throw IllegalStateException() } @@ -79,11 +79,6 @@ public class CallableMethod(override val owner: Type, private val defaultImplOwn } } - public fun invokeDefaultWithNotNullAssertion(v: InstructionAdapter, state: GenerationState, resolvedCall: ResolvedCall<*>) { - invokeDefault(v) - AsmUtil.genNotNullAssertionForMethod(v, state, resolvedCall) - } - override val returnType: Type get() = signature.getReturnType() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 3c9b703d0af..de5591535fc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -958,7 +958,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { iv.load(reg, argType); reg += argType.getSize(); } - callableMethod.invokeWithoutAssertions(iv); + callableMethod.genInvokeInstruction(iv); } private void generateFieldForSingleton() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index bb555147f0b..e2e5673d005 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -71,7 +71,7 @@ class PlatformStaticGenerator( false, codegen.getContext() ) - syntheticOrOriginalMethod.invokeWithoutAssertions(iv) + syntheticOrOriginalMethod.genInvokeInstruction(iv) iv.areturn(asmMethod.getReturnType()); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index ecc89c9d2d1..42692cd6b03 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.invokeWithoutAssertions(v); + getter.genInvokeInstruction(v); coerceTo(type, v); } @@ -963,7 +963,7 @@ public abstract class StackValue { Type[] argumentTypes = setter.getParameterTypes(); coerce(topOfStackType, argumentTypes[argumentTypes.length - 1], v); - setter.invokeWithoutAssertions(v); + setter.genInvokeInstruction(v); Type returnType = setter.getReturnType(); if (returnType != Type.VOID_TYPE) { pop(v, returnType); @@ -1029,7 +1029,7 @@ public abstract class StackValue { coerceTo(type, v); } else { - getter.invokeWithoutAssertions(v); + getter.genInvokeInstruction(v); coerce(getter.getReturnType(), type, v); } } @@ -1042,7 +1042,7 @@ public abstract class StackValue { v.visitFieldInsn(isStaticStore ? PUTSTATIC : PUTFIELD, backingFieldOwner.getInternalName(), fieldName, this.type.getDescriptor()); } else { - setter.invokeWithoutAssertions(v); + setter.genInvokeInstruction(v); } } 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 635506c9d97..2f09be6f554 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt @@ -36,7 +36,7 @@ public open class IntrinsicCallable(override val returnType: Type, } - override fun invokeWithoutAssertions(v: InstructionAdapter) { + override fun genInvokeInstruction(v: InstructionAdapter) { invokeIntrinsic(v) }