azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Intrinsic.toCallable clean

Browse Source
This commit is contained in:
Michael Bogdanov
2015-04-04 13:40:42 +03:00
parent d55c5fe0e4
commit 69ddb6bfca
22 changed files with 66 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.kt
+5 -6
View File
@@ -23,10 +23,9 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
public class ArrayGet : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return MappedCallable(method) {
val type = correctElementType(calcReceiverType())
it.aload(type)
}
}
override fun toCallable(method: CallableMethod): Callable =
createMappedCallable(method) {
val type = correctElementType(calcReceiverType())
it.aload(type)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.kt
+5 -5
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME
import org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.codegen.context.CodegenContext
@@ -32,6 +33,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression
import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetSimpleNameExpression
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import org.jetbrains.org.objectweb.asm.Type
@@ -63,9 +65,8 @@ public class ArrayIterator : IntrinsicMethod() {
throw UnsupportedOperationException(containingDeclaration.toString())
}
//TODO refactor
override fun toCallable(state: GenerationState, fd: FunctionDescriptor, context: CodegenContext<*>, isSuper: Boolean): Callable {
val callableMethod = state.getTypeMapper().mapToCallableMethod(fd, false, context)
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val method = codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext())
val containingDeclaration = fd.getContainingDeclaration().getOriginal() as ClassDescriptor
var type: Type? = null;
@@ -89,8 +90,7 @@ public class ArrayIterator : IntrinsicMethod() {
throw UnsupportedOperationException(containingDeclaration.toString())
}
return UnaryIntrinsic(callableMethod, type) {
return createUnaryCallable(method, type) {
val containingDeclaration = fd.getContainingDeclaration().getOriginal() as ClassDescriptor
if (containingDeclaration == KotlinBuiltIns.getInstance().getArray()) {
it.invokestatic("kotlin/jvm/internal/InternalPackage", "iterator", "([Ljava/lang/Object;)Ljava/util/Iterator;", false)
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class ArraySize : IntrinsicMethod() {
public override fun toCallable(method: CallableMethod): Callable {
return UnaryIntrinsic(method, null, false) { adapter ->
return createUnaryCallable(method) { adapter ->
adapter.arraylength()
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
+1 -1
View File
@@ -36,7 +36,7 @@ public class BinaryOp(private val opcode: Int) : IntrinsicMethod() {
val operandType = numberFunctionOperandType(returnType)
val paramType = if (shift()) Type.INT_TYPE else operandType
return IntrinsicCallable.binaryIntrinsic(operandType, paramType, operandType) {
return binaryIntrinsic(operandType, paramType, operandType) {
v -> v.visitInsn(returnType.getOpcode(opcode))
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes
public class Clone : IntrinsicMethod() {
override fun toCallable(method: CallableMethod, isSuperCall: Boolean): Callable {
return UnaryIntrinsic(method, OBJECT_TYPE) {
return createUnaryCallable(method, OBJECT_TYPE) {
val opcodes: Int = if (isSuperCall) Opcodes.INVOKESPECIAL else Opcodes.INVOKEVIRTUAL
it.visitMethodInsn(opcodes, "java/lang/Object", "clone", "()Ljava/lang/Object;", false)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.kt
+1 -1
View File
@@ -44,7 +44,7 @@ public class CompareTo : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
val argumentType = comparisonOperandType(method.thisType ?: method.receiverType, method.argumentTypes.first())
return IntrinsicCallable.binaryIntrinsic(method.returnType, argumentType, argumentType, null) {
return binaryIntrinsic(method.returnType, argumentType, argumentType, null) {
genInvoke(argumentType, it)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.kt
+4 -3
View File
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.codegen.AsmUtil.genInvokeAppendMethod
import org.jetbrains.kotlin.codegen.AsmUtil.genStringBuilderConstructor
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -54,9 +55,9 @@ public class Concat : IntrinsicMethod() {
return JAVA_STRING_TYPE
}
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val callable = codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext())
return object : MappedCallable(callable, {}) {
override fun toCallable(method: CallableMethod): Callable {
return object : MappedCallable(method) {
override fun invokeMethodWithArguments(resolvedCall: ResolvedCall<*>, receiver: StackValue, returnType: Type, codegen: ExpressionCodegen): StackValue {
return StackValue.operation(returnType) {
val arguments = resolvedCall.getCall().getValueArguments().map { it.getArgumentExpression() }
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE
public class Equals : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return IntrinsicCallable.binaryIntrinsic(method.returnType, OBJECT_TYPE, nullOrObject(method.thisType), nullOrObject(method.receiverType)) {
return binaryIntrinsic(method.returnType, OBJECT_TYPE, nullOrObject(method.thisType), nullOrObject(method.receiverType)) {
AsmUtil.genAreEqualCall(it)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.kt
+4 -3
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.codegen.intrinsics
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -29,9 +30,9 @@ import org.jetbrains.org.objectweb.asm.Type
public class IdentityEquals : IntrinsicMethod() {
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val callable = codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext())
return object : MappedCallable(callable) {
override fun toCallable(method: CallableMethod): Callable {
return object : MappedCallable(method) {
override fun invokeMethodWithArguments(resolvedCall: ResolvedCall<*>, receiver: StackValue, returnType: Type, codegen: ExpressionCodegen): StackValue {
val element = resolvedCall.getCall().getCallElement()
val left: StackValue
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt
+3 -3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen.intrinsics
import org.jetbrains.kotlin.codegen.AsmUtil.genIncrement
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.psi.JetPrefixExpression
@@ -25,9 +26,8 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
public class Increment(private val myDelta: Int) : IntrinsicMethod() {
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val method = codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext())
return MappedCallable(method) {
override fun toCallable(method: CallableMethod, isSuper: Boolean, resolvedCall: ResolvedCall<*>): Callable {
return createMappedCallable(method) {
val jetExpression = resolvedCall.getCall().getCalleeExpression()
assert(jetExpression !is JetPrefixExpression) { "There should be postfix increment ${jetExpression!!.getText()}" }
genIncrement(returnType, myDelta, it)
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicCallable.kt
+18 -38
View File
@@ -30,40 +30,6 @@ public abstract class IntrinsicCallable(override val returnType: Type,
override val thisType: Type?,
override val receiverType: Type?) : Callable {
companion object {
fun create(descriptor: FunctionDescriptor, context: CodegenContext<*>, state: GenerationState, lambda: IntrinsicCallable.(i: InstructionAdapter) -> Unit): IntrinsicCallable {
return create(state.getTypeMapper().mapToCallableMethod(descriptor, false, context), lambda)
}
fun create(callableMethod: CallableMethod, lambda: IntrinsicCallable.(i: InstructionAdapter) -> Unit): IntrinsicCallable {
return object : IntrinsicCallable(callableMethod.returnType, callableMethod.valueParameterTypes, callableMethod.thisType, callableMethod.receiverType) {
override fun invokeIntrinsic(v: InstructionAdapter) {
lambda(v)
}
}
}
fun binaryIntrinsic(returnType: Type, valueParameterType: Type, thisType: Type? = null, receiverType: Type? = null, lambda: IntrinsicCallable.(i: InstructionAdapter) -> Unit): IntrinsicCallable {
assert(AsmUtil.isPrimitive(returnType)) { "Return type of BinaryOp intrinsic should be of primitive type : " + returnType }
return object : IntrinsicCallable(returnType, listOf(valueParameterType), thisType, receiverType) {
override fun invokeIntrinsic(v: InstructionAdapter) {
lambda(v)
}
}
}
fun create(descriptor: FunctionDescriptor, context: CodegenContext<*>, state: GenerationState, receiverTransformer: Type.() -> Type, lambda: IntrinsicCallable.(i: InstructionAdapter) -> Unit): IntrinsicCallable {
val callableMethod = state.getTypeMapper().mapToCallableMethod(descriptor, false, context)
return object : IntrinsicCallable(callableMethod.returnType, callableMethod.valueParameterTypes, callableMethod.thisType?.receiverTransformer(), callableMethod.receiverType?.receiverTransformer()) {
override fun invokeIntrinsic(v: InstructionAdapter) {
lambda(v)
}
}
}
}
override fun invokeWithoutAssertions(v: InstructionAdapter) {
invokeIntrinsic(v)
}
@@ -96,9 +62,17 @@ public abstract class IntrinsicCallable(override val returnType: Type,
public fun calcReceiverType(): Type? {
return receiverType ?: thisType
}
}
fun binaryIntrinsic(returnType: Type, valueParameterType: Type, thisType: Type? = null, receiverType: Type? = null, lambda: IntrinsicCallable.(i: InstructionAdapter) -> Unit): IntrinsicCallable {
assert(AsmUtil.isPrimitive(returnType)) { "Return type of BinaryOp intrinsic should be of primitive type : " + returnType }
return object : IntrinsicCallable(returnType, listOf(valueParameterType), thisType, receiverType) {
override fun invokeIntrinsic(v: InstructionAdapter) {
lambda(v)
}
}
}
public class UnaryIntrinsic(val callable: CallableMethod, val newReturnType: Type? = null, needPrimitiveCheck: Boolean = false, val newThisType: Type? = null, val invoke: UnaryIntrinsic.(v: InstructionAdapter) -> Unit) :
IntrinsicCallable(newReturnType ?: callable.returnType, callable.valueParameterTypes, newThisType ?: callable.thisType, callable.receiverType) {
@@ -113,14 +87,20 @@ public class UnaryIntrinsic(val callable: CallableMethod, val newReturnType: Typ
override fun invokeIntrinsic(v: InstructionAdapter) {
invoke(v)
}
}
public open class MappedCallable(val callable: CallableMethod, val invoke: MappedCallable.(v: InstructionAdapter) -> Unit = {}) :
IntrinsicCallable(callable.returnType, callable.valueParameterTypes, callable.thisType, callable.receiverType) {
public fun createUnaryCallable(callable: CallableMethod, newReturnType: Type? = null, needPrimitiveCheck: Boolean = false, invoke: IntrinsicCallable.(v: InstructionAdapter) -> Unit) : IntrinsicCallable {
return UnaryIntrinsic(callable, newReturnType, needPrimitiveCheck, invoke = invoke)
}
public open class MappedCallable(val callable: CallableMethod, val invoke: IntrinsicCallable.(v: InstructionAdapter) -> Unit = {}) :
IntrinsicCallable(callable.returnType, callable.valueParameterTypes, callable.thisType, callable.receiverType) {
override fun invokeIntrinsic(v: InstructionAdapter) {
invoke(v)
}
}
public fun createMappedCallable(callable: CallableMethod, invoke: IntrinsicCallable.(v: InstructionAdapter) -> Unit) : IntrinsicCallable {
return MappedCallable(callable, invoke)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java
+4 -26
View File
@@ -16,8 +16,6 @@
package org.jetbrains.kotlin.codegen.intrinsics;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.Callable;
import org.jetbrains.kotlin.codegen.CallableMethod;
@@ -29,31 +27,20 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.jvm.AsmTypes;
import org.jetbrains.org.objectweb.asm.Type;
import java.util.List;
import static org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType;
public abstract class IntrinsicMethod {
@NotNull
public Callable toCallable(@NotNull FunctionDescriptor fd, boolean isSuper, @NotNull ResolvedCall resolvedCall, @NotNull ExpressionCodegen codegen) {
return toCallable(codegen.getState(), fd, codegen.getContext(), isSuper, resolvedCall);
return toCallable(codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext()), isSuper, resolvedCall);
}
@NotNull
public Callable toCallable(@NotNull GenerationState state, @NotNull FunctionDescriptor fd, @NotNull CodegenContext<?> context, boolean isSuper, @NotNull
ResolvedCall resolvedCall) {
return toCallable(state, fd, context, isSuper);
}
@NotNull
public Callable toCallable(@NotNull GenerationState state, @NotNull FunctionDescriptor fd, @NotNull CodegenContext<?> context, boolean isSuper) {
return toCallable(state.getTypeMapper().mapToCallableMethod(fd, false, context), isSuper);
public Callable toCallable(@NotNull CallableMethod method, boolean isSuper, @NotNull ResolvedCall resolvedCall) {
return toCallable(method, isSuper);
}
@NotNull
public Callable toCallable(@NotNull CallableMethod method, boolean isSuperCall) {
//assert !isSuper;
return toCallable(method);
}
@@ -62,15 +49,6 @@ public abstract class IntrinsicMethod {
throw new UnsupportedOperationException("Not implemented");
}
public List<Type> transformTypes(List<Type> types) {
return Lists.transform(types, new Function<Type, Type>() {
@Override
public Type apply(Type input) {
return numberFunctionOperandType(input);
}
});
}
public Type nullOrObject(Type type) {
return nullOr(type, AsmTypes.OBJECT_TYPE);
}
@@ -79,4 +57,4 @@ public abstract class IntrinsicMethod {
return type == null ? null : newType;
}
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.kt
+1 -1
View File
@@ -25,7 +25,7 @@ public class Inv : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
val type = numberFunctionOperandType(method.returnType)
return UnaryIntrinsic(method, method.returnType, newThisType = type) {
return UnaryIntrinsic(method, newThisType = type) {
if (returnType == Type.LONG_TYPE) {
it.lconst(-1)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.kt
+6 -3
View File
@@ -18,9 +18,12 @@ package org.jetbrains.kotlin.codegen.intrinsics
import org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.context.CodegenContext
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.jvm.AsmTypes
import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
@@ -59,11 +62,11 @@ public class IteratorNext : IntrinsicMethod() {
return name
}
override fun toCallable(state: GenerationState, fd: FunctionDescriptor, context: CodegenContext<*>, isSuper: Boolean): Callable {
val type = state.getTypeMapper().mapReturnType(fd)
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val type = codegen.getState().getTypeMapper().mapReturnType(fd)
return object: IntrinsicCallable(type, listOf(), AsmTypes.OBJECT_TYPE, null) {
override fun invokeIntrinsic(v: InstructionAdapter) {
val returnType = returnType
val name = getIteratorName(returnType)
v.invokevirtual(BUILT_INS_PACKAGE_FQ_NAME.toString() + "/" + name + "Iterator", "next" + name, "()" + returnType.getDescriptor(), false)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class JavaClassArray : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return MappedCallable(method) {
return createMappedCallable(method) {
//do nothing all generated as vararg
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.kt
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.codegen.intrinsics
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.context.CodegenContext
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -32,7 +33,7 @@ public class MonitorInstruction private(private val opcode: Int) : IntrinsicMeth
public val MONITOR_EXIT: MonitorInstruction = MonitorInstruction(Opcodes.MONITOREXIT)
}
override fun toCallable(state: GenerationState, fd: FunctionDescriptor, context: CodegenContext<*>, isSuper: Boolean, resolvedCall: ResolvedCall<*>): Callable {
override fun toCallable(method: CallableMethod): Callable {
return object : IntrinsicCallable(Type.VOID_TYPE, listOf(OBJECT_TYPE), null, null) {
override fun invokeIntrinsic(v: InstructionAdapter) {
v.visitInsn(opcode)
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.kt
+3 -4
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen.intrinsics
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -38,10 +39,8 @@ public class Not : IntrinsicMethod() {
return StackValue.not(StackValue.coercion(stackValue, Type.BOOLEAN_TYPE))
}
override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable {
val callable = codegen.getState().getTypeMapper().mapToCallableMethod(fd, false, codegen.getContext())
return object : MappedCallable(callable, {}) {
override fun toCallable(method: CallableMethod): Callable {
return object : MappedCallable(method) {
override fun invokeMethodWithArguments(resolvedCall: ResolvedCall<*>, receiver: StackValue, returnType: Type, codegen: ExpressionCodegen): StackValue {
val element = resolvedCall.getCall().getCallElement()
val stackValue =
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.StackValue
public class NumberCast : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return UnaryIntrinsic(method) {
return createUnaryCallable(method) {
StackValue.coerce(calcReceiverType()!!, returnType, it)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class StringGetChar : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return IntrinsicCallable.create(method) {
return createMappedCallable(method) {
it.invokevirtual("java/lang/String", "charAt", "(I)C", false)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class StringPlus : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return IntrinsicCallable.create(method) {
return createMappedCallable(method) {
it.invokestatic("kotlin/jvm/internal/Intrinsics", "stringPlus", "(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;", false)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class UnaryMinus : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return UnaryIntrinsic(method, numberFunctionOperandType(method.returnType), needPrimitiveCheck = true) {
return createUnaryCallable(method, numberFunctionOperandType(method.returnType), needPrimitiveCheck = true) {
it.neg(returnType)
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod
public class UnaryPlus : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable {
return UnaryIntrinsic(method, needPrimitiveCheck = true) {
return createUnaryCallable(method, needPrimitiveCheck = true) {
//nothing
}
}