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

Removed AnonymousObjectGeneration from RegeneratedClassContext

Browse Source
This commit is contained in:
Michael Bogdanov
2016-03-11 11:55:51 +03:00
parent 60ee5441cf
commit a0f050fc69
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
+3 -3
View File
@@ -77,14 +77,14 @@ public class InliningContext {
return subInline(generator, additionalTypeMappings, isInliningLambda); return subInline(generator, additionalTypeMappings, isInliningLambda);
} }
public InliningContext subInlineWithClassRegeneration(@NotNull NameGenerator generator, public InliningContext subInlineWithClassRegeneration(
@NotNull NameGenerator generator,
@NotNull Map<String, String> newTypeMappings, @NotNull Map<String, String> newTypeMappings,
@NotNull AnonymousObjectGeneration anonymousObjectGeneration,
@NotNull InlineCallSiteInfo callSiteInfo @NotNull InlineCallSiteInfo callSiteInfo
) { ) {
return new RegeneratedClassContext(this, expressionMap, state, generator, return new RegeneratedClassContext(this, expressionMap, state, generator,
TypeRemapper.createFrom(typeRemapper, newTypeMappings), TypeRemapper.createFrom(typeRemapper, newTypeMappings),
reifedTypeInliner, isInliningLambda, anonymousObjectGeneration, callSiteInfo); reifedTypeInliner, isInliningLambda, callSiteInfo);
} }
public InliningContext subInline(NameGenerator generator, Map<String, String> additionalTypeMappings, boolean isInliningLambda) { public InliningContext subInline(NameGenerator generator, Map<String, String> additionalTypeMappings, boolean isInliningLambda) {
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
-1
View File
@@ -188,7 +188,6 @@ public class MethodInliner {
.subInlineWithClassRegeneration( .subInlineWithClassRegeneration(
inliningContext.nameGenerator, inliningContext.nameGenerator,
currentTypeMapping, currentTypeMapping,
anonymousObjectGen,
inlineCallSiteInfo), inlineCallSiteInfo),
isSameModule, Type.getObjectType(newClassName) isSameModule, Type.getObjectType(newClassName)
); );
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
-3
View File
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
import java.util.Map; import java.util.Map;
public class RegeneratedClassContext extends InliningContext { public class RegeneratedClassContext extends InliningContext {
private final AnonymousObjectGeneration anonymousObjectGeneration;
private InlineCallSiteInfo callSiteInfo; private InlineCallSiteInfo callSiteInfo;
public RegeneratedClassContext( public RegeneratedClassContext(
@@ -34,11 +33,9 @@ public class RegeneratedClassContext extends InliningContext {
@NotNull TypeRemapper typeRemapper, @NotNull TypeRemapper typeRemapper,
@NotNull ReifiedTypeInliner reifiedTypeInliner, @NotNull ReifiedTypeInliner reifiedTypeInliner,
boolean isInliningLambda, boolean isInliningLambda,
@NotNull AnonymousObjectGeneration anonymousObjectGeneration,
@NotNull InlineCallSiteInfo callSiteInfo @NotNull InlineCallSiteInfo callSiteInfo
) { ) {
super(parent, map, state, nameGenerator, typeRemapper, reifiedTypeInliner, isInliningLambda, true); super(parent, map, state, nameGenerator, typeRemapper, reifiedTypeInliner, isInliningLambda, true);
this.anonymousObjectGeneration = anonymousObjectGeneration;
this.callSiteInfo = callSiteInfo; this.callSiteInfo = callSiteInfo;
} }