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

New name generation for transformed when classes

Browse Source
This commit is contained in:
Michael Bogdanov
2016-03-14 12:19:46 +03:00
parent a72636afb8
commit 92f1a20d5f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/NameGenerator.java
+7 -2
View File
@@ -23,7 +23,8 @@ public class NameGenerator {
private final String ownerMethod; private final String ownerMethod;
private int nextIndex = 1; private int nextLambdaIndex = 1;
private int nextWhenIndex = 1;
private final Map<String, NameGenerator> subGenerators = new HashMap<String, NameGenerator>(); private final Map<String, NameGenerator> subGenerators = new HashMap<String, NameGenerator>();
@@ -32,7 +33,11 @@ public class NameGenerator {
} }
public String genLambdaClassName() { public String genLambdaClassName() {
return ownerMethod + "$" + nextIndex++; return ownerMethod + "$" + nextLambdaIndex++;
}
public String genWhenClassNamePrefix() {
return ownerMethod + "$" + nextWhenIndex++;
} }
public NameGenerator subGenerator(String inliningMethod) { public NameGenerator subGenerator(String inliningMethod) {
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt
+5 -1
View File
@@ -43,7 +43,7 @@ class WhenMappingTransformationInfo(
) : TransformationInfo { ) : TransformationInfo {
override val newClassName by lazy { override val newClassName by lazy {
nameGenerator.genLambdaClassName() + oldClassName.substringAfterLast("/") nameGenerator.genWhenClassNamePrefix() + TRANSFORMED_WHEN_MAPPING_MARKER + oldClassName.substringAfterLast("/").substringAfterLast(TRANSFORMED_WHEN_MAPPING_MARKER)
} }
override fun shouldRegenerate(sameModule: Boolean): Boolean { override fun shouldRegenerate(sameModule: Boolean): Boolean {
@@ -57,6 +57,10 @@ class WhenMappingTransformationInfo(
override fun createTransformer(inliningContext: InliningContext, sameModule: Boolean): ObjectTransformer<*> { override fun createTransformer(inliningContext: InliningContext, sameModule: Boolean): ObjectTransformer<*> {
return WhenMappingTransformer(this, inliningContext) return WhenMappingTransformer(this, inliningContext)
} }
companion object {
const val TRANSFORMED_WHEN_MAPPING_MARKER = "\$wm$"
}
} }
class AnonymousObjectTransformationInfo internal constructor( class AnonymousObjectTransformationInfo internal constructor(