Removed AnonymousObjectGeneration from RegeneratedClassContext

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
@@ -77,14 +77,14 @@ public class InliningContext {
return subInline(generator, additionalTypeMappings, isInliningLambda);
}
public InliningContext subInlineWithClassRegeneration(@NotNull NameGenerator generator,
public InliningContext subInlineWithClassRegeneration(
@NotNull NameGenerator generator,
@NotNull Map<String, String> newTypeMappings,
@NotNull AnonymousObjectGeneration anonymousObjectGeneration,
@NotNull InlineCallSiteInfo callSiteInfo
) {
return new RegeneratedClassContext(this, expressionMap, state, generator,
TypeRemapper.createFrom(typeRemapper, newTypeMappings),
reifedTypeInliner, isInliningLambda, anonymousObjectGeneration, callSiteInfo);
reifedTypeInliner, isInliningLambda, callSiteInfo);
}
public InliningContext subInline(NameGenerator generator, Map<String, String> additionalTypeMappings, boolean isInliningLambda) {
@@ -188,7 +188,6 @@ public class MethodInliner {
.subInlineWithClassRegeneration(
inliningContext.nameGenerator,
currentTypeMapping,
anonymousObjectGen,
inlineCallSiteInfo),
isSameModule, Type.getObjectType(newClassName)
);
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
import java.util.Map;
public class RegeneratedClassContext extends InliningContext {
private final AnonymousObjectGeneration anonymousObjectGeneration;
private InlineCallSiteInfo callSiteInfo;
public RegeneratedClassContext(
@@ -34,11 +33,9 @@ public class RegeneratedClassContext extends InliningContext {
@NotNull TypeRemapper typeRemapper,
@NotNull ReifiedTypeInliner reifiedTypeInliner,
boolean isInliningLambda,
@NotNull AnonymousObjectGeneration anonymousObjectGeneration,
@NotNull InlineCallSiteInfo callSiteInfo
) {
super(parent, map, state, nameGenerator, typeRemapper, reifiedTypeInliner, isInliningLambda, true);
this.anonymousObjectGeneration = anonymousObjectGeneration;
this.callSiteInfo = callSiteInfo;
}