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

Support default inline lambda reification

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-05-15 11:57:06 +02:00
parent 9e8495dc3d
commit 6730fa2bbf
10 changed files with 96 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt
+1 -1
View File
@@ -183,7 +183,7 @@ class AnonymousObjectTransformer(
capturedBuilder: ParametersBuilder,
isConstructor: Boolean
): InlineResult {
val typeParametersToReify = inliningContext.root.reifiedTypeInliner.reifyInstructions(sourceNode)
val typeParametersToReify = inliningContext.root.inlineMethodReificator.reifyInstructions(sourceNode)
val parameters = if (isConstructor) capturedBuilder.buildParameters() else getMethodParametersWithCaptured(capturedBuilder, sourceNode)
val remapper = RegeneratedLambdaFieldRemapper(
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class RootInliningContext(
nameGenerator: NameGenerator,
val callElement: KtElement,
override val callSiteInfo: InlineCallSiteInfo,
val reifiedTypeInliner: ReifiedTypeInliner,
val inlineMethodReificator: ReifiedTypeInliner,
typeParameterMappings: TypeParameterMappings
) : InliningContext(
null, expressionMap, state, nameGenerator, TypeRemapper.createRoot(typeParameterMappings), null, false
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+16 -7
View File
@@ -75,6 +75,12 @@ class MethodInliner(
): InlineResult {
//analyze body
var transformedNode = markPlacesForInlineAndRemoveInlinable(node, labelOwner, finallyDeepShift)
if (inliningContext.isInliningLambda &&
inliningContext.lambdaInfo is DefaultLambda &&
inliningContext.lambdaInfo.needReification) {
//TODO maybe move reification in one place
inliningContext.root.inlineMethodReificator.reifyInstructions(transformedNode)
}
//substitute returns with "goto end" instruction to keep non local returns in lambdas
val end = Label()
@@ -203,7 +209,7 @@ class MethodInliner(
setLambdaInlining(true)
val lambdaSMAP = info.node.classSMAP
val mapper = if (inliningContext.classRegeneration && !inliningContext.isInliningLambda)
val sourceMapper = if (inliningContext.classRegeneration && !inliningContext.isInliningLambda)
NestedSourceMapper(sourceMapper, lambdaSMAP.intervals, lambdaSMAP.sourceInfo)
else
InlineLambdaSourceMapper(sourceMapper.parent!!, info.node)
@@ -211,12 +217,12 @@ class MethodInliner(
info.node.node, lambdaParameters, inliningContext.subInlineLambda(info),
newCapturedRemapper, true /*cause all calls in same module as lambda*/,
"Lambda inlining " + info.lambdaClassType.internalName,
mapper, inlineCallSiteInfo, null
sourceMapper, inlineCallSiteInfo, null
)
val remapper = LocalVarRemapper(lambdaParameters, valueParamShift)
val varRemapper = LocalVarRemapper(lambdaParameters, valueParamShift)
//TODO add skipped this and receiver
val lambdaResult = inliner.doInline(this.mv, remapper, true, info, invokeCall.finallyDepthShift)
val lambdaResult = inliner.doInline(this.mv, varRemapper, true, info, invokeCall.finallyDepthShift)
result.mergeWithNotChangeInfo(lambdaResult)
result.reifiedTypeParametersUsages.mergeAll(lambdaResult.reifiedTypeParametersUsages)
@@ -225,7 +231,7 @@ class MethodInliner(
StackValue.onStack(info.invokeMethod.returnType).put(bridge.returnType, this)
setLambdaInlining(false)
addInlineMarker(this, false)
mapper.endMapping()
sourceMapper.endMapping()
inlineOnlySmapSkipper?.markCallSiteLineNumber(remappingMethodAdapter)
}
else if (isAnonymousConstructorCall(owner, name)) { //TODO add method
@@ -268,8 +274,11 @@ class MethodInliner(
super.visitMethodInsn(opcode, owner, name, desc, itf)
}
}
else if (!inliningContext.isInliningLambda && ReifiedTypeInliner.isNeedClassReificationMarker(MethodInsnNode(opcode, owner, name, desc, false))) {
//we shouldn't process here content of inlining lambda it should be reified at external level
else if ((!inliningContext.isInliningLambda ||
inliningContext.lambdaInfo is DefaultLambda &&
inliningContext.lambdaInfo.needReification) &&
ReifiedTypeInliner.isNeedClassReificationMarker(MethodInsnNode(opcode, owner, name, desc, false))) {
//we shouldn't process here content of inlining lambda it should be reified at external level except default lambdas
}
else {
super.visitMethodInsn(opcode, owner, name, desc, itf)
compiler/testData/codegen/boxInline/reified/defaultLambda/nested.kt
Vendored
+2 -2
View File
@@ -9,11 +9,11 @@ inline fun <reified T> inlineFun(p: String, lambda: () -> String = { { p + T::cl
}
// FILE: 2.kt
//NO_CHECK_LAMBDA_INLINING
import test.*
class K
fun box(): String {
return inlineFun<OK>("O")
return inlineFun<K>("O")
}
compiler/testData/codegen/boxInline/reified/defaultLambda/nested2.kt
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ inline fun <reified T> inlineFun(p: String, crossinline lambda: () -> String = {
import test.*
class OK
class K
fun box(): String {
return inlineFun<OK>()
return inlineFun<K>("O")
}
compiler/testData/codegen/boxInline/reified/defaultLambda/nestedStatic.kt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ inline fun <reified T> inlineFun(lambda: () -> String = { { T::class.java.simple
}
// FILE: 2.kt
//NO_CHECK_LAMBDA_INLINING
import test.*
class OK
compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChain.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// FILE: 1.kt
// SKIP_INLINE_CHECK_IN: inlineFun$default
//WITH_RUNTIME
package test
class K
@Suppress("NOT_YET_SUPPORTED_IN_INLINE")
inline fun <reified T> inlineFun(p: String, lambda: () -> String = { p + T::class.java.simpleName }): String {
return lambda()
}
inline fun <reified X> inlineFun2(p: String): String {
return inlineFun<X>(p)
}
// FILE: 2.kt
import test.*
fun box(): String {
return inlineFun2<K>("O")
}
compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChainStatic.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
// FILE: 1.kt
// SKIP_INLINE_CHECK_IN: inlineFun$default
//WITH_RUNTIME
package test
class OK
class FAIL
@Suppress("NOT_YET_SUPPORTED_IN_INLINE")
inline fun <reified T> inlineFun(lambda: () -> String = { T::class.java.simpleName }): String {
return lambda()
}
inline fun <reified X> inlineFun2(): String {
return inlineFun<X>()
}
// FILE: 2.kt
import test.*
fun box(): String {
return inlineFun2<OK>()
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
+12
View File
@@ -2184,6 +2184,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/simple.kt");
doTest(fileName);
}
@TestMetadata("transitiveChain.kt")
public void testTransitiveChain() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChain.kt");
doTest(fileName);
}
@TestMetadata("transitiveChainStatic.kt")
public void testTransitiveChainStatic() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChainStatic.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/boxInline/reified/isCheck")
compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
+12
View File
@@ -2184,6 +2184,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/simple.kt");
doTest(fileName);
}
@TestMetadata("transitiveChain.kt")
public void testTransitiveChain() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChain.kt");
doTest(fileName);
}
@TestMetadata("transitiveChainStatic.kt")
public void testTransitiveChainStatic() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/defaultLambda/transitiveChainStatic.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/boxInline/reified/isCheck")