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

Minor. Reformat

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-09-25 10:00:40 +02:00
parent b58d75440b
commit bf35818438
1 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.kt
+41 -42
View File
@@ -32,20 +32,19 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
class Concat : IntrinsicMethod() { class Concat : IntrinsicMethod() {
fun generateImpl( fun generateImpl(
codegen: ExpressionCodegen, codegen: ExpressionCodegen,
v: InstructionAdapter, v: InstructionAdapter,
returnType: Type, returnType: Type,
element: PsiElement?, element: PsiElement?,
arguments: List<KtExpression>, arguments: List<KtExpression>,
receiver: StackValue receiver: StackValue
): Type { ): Type {
if (element is KtBinaryExpression && element.operationReference.getReferencedNameElementType() == KtTokens.PLUS) { if (element is KtBinaryExpression && element.operationReference.getReferencedNameElementType() == KtTokens.PLUS) {
// LHS + RHS // LHS + RHS
genStringBuilderConstructor(v) genStringBuilderConstructor(v)
codegen.invokeAppend(v, element.left) codegen.invokeAppend(v, element.left)
codegen.invokeAppend(v, element.right) codegen.invokeAppend(v, element.right)
} } else {
else {
// Explicit plus call LHS?.plus(RHS) or LHS.plus(RHS) // Explicit plus call LHS?.plus(RHS) or LHS.plus(RHS)
receiver.put(AsmTypes.JAVA_STRING_TYPE, v) receiver.put(AsmTypes.JAVA_STRING_TYPE, v)
genStringBuilderConstructor(v) genStringBuilderConstructor(v)
@@ -59,41 +58,41 @@ class Concat : IntrinsicMethod() {
} }
override fun toCallable(method: CallableMethod): Callable = override fun toCallable(method: CallableMethod): Callable =
object : IntrinsicCallable(method) { object : IntrinsicCallable(method) {
override fun invokeMethodWithArguments( override fun invokeMethodWithArguments(
resolvedCall: ResolvedCall<*>, resolvedCall: ResolvedCall<*>,
receiver: StackValue, receiver: StackValue,
codegen: ExpressionCodegen codegen: ExpressionCodegen
): StackValue { ): StackValue {
if (resolvedCall.call.callElement.parent is KtCallableReferenceExpression) { if (resolvedCall.call.callElement.parent is KtCallableReferenceExpression) {
// NB we come here only in case of inlined callable reference to String::plus. // NB we come here only in case of inlined callable reference to String::plus.
// This will map arguments properly, invoking callbacks defined in Callable. // This will map arguments properly, invoking callbacks defined in Callable.
return super.invokeMethodWithArguments(resolvedCall, receiver, codegen) return super.invokeMethodWithArguments(resolvedCall, receiver, codegen)
}
return StackValue.operation(returnType) {
val arguments = resolvedCall.call.valueArguments.map { it.getArgumentExpression()!! }
val actualType = generateImpl(
codegen, it, returnType,
resolvedCall.call.callElement,
arguments,
StackValue.receiver(resolvedCall, receiver, codegen, this)
)
StackValue.coerce(actualType, returnType, it)
}
} }
return StackValue.operation(returnType) {
override fun afterReceiverGeneration(v: InstructionAdapter, frameMap: FrameMap) { val arguments = resolvedCall.call.valueArguments.map { it.getArgumentExpression()!! }
v.generateNewInstanceDupAndPlaceBeforeStackTop(frameMap, AsmTypes.JAVA_STRING_TYPE, "java/lang/StringBuilder") val actualType = generateImpl(
v.invokespecial("java/lang/StringBuilder", "<init>", "(Ljava/lang/String;)V", false) codegen, it, returnType,
} resolvedCall.call.callElement,
arguments,
override fun invokeIntrinsic(v: InstructionAdapter) { StackValue.receiver(resolvedCall, receiver, codegen, this)
// String::plus has type String.(Any?) -> String, thus we have no argument type information )
// in case of callable reference passed to a generic function, e.g.: StackValue.coerce(actualType, returnType, it)
// charArrayOf('O', 'K').fold("", String::plus)
// TODO Make String::plus generic, and invoke proper StringBuilder#append.
genInvokeAppendMethod(v, AsmTypes.OBJECT_TYPE, null)
v.invokevirtual("java/lang/StringBuilder", "toString", "()Ljava/lang/String;", false)
} }
} }
override fun afterReceiverGeneration(v: InstructionAdapter, frameMap: FrameMap) {
v.generateNewInstanceDupAndPlaceBeforeStackTop(frameMap, AsmTypes.JAVA_STRING_TYPE, "java/lang/StringBuilder")
v.invokespecial("java/lang/StringBuilder", "<init>", "(Ljava/lang/String;)V", false)
}
override fun invokeIntrinsic(v: InstructionAdapter) {
// String::plus has type String.(Any?) -> String, thus we have no argument type information
// in case of callable reference passed to a generic function, e.g.:
// charArrayOf('O', 'K').fold("", String::plus)
// TODO Make String::plus generic, and invoke proper StringBuilder#append.
genInvokeAppendMethod(v, AsmTypes.OBJECT_TYPE, null)
v.invokevirtual("java/lang/StringBuilder", "toString", "()Ljava/lang/String;", false)
}
}
} }