From a0f050fc69a40b5cf3f219b689c9c8dd8611093e Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 11 Mar 2016 11:55:51 +0300
Subject: [PATCH] Removed AnonymousObjectGeneration from
 RegeneratedClassContext

---
 .../jetbrains/kotlin/codegen/inline/InliningContext.java    | 6 +++---
 .../org/jetbrains/kotlin/codegen/inline/MethodInliner.java  | 1 -
 .../kotlin/codegen/inline/RegeneratedClassContext.java      | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
index 3de46ffecc9..391ed54a734 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
@@ -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) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
index 88ba2352b1c..5a2c4c89598 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
@@ -188,7 +188,6 @@ public class MethodInliner {
                                                                    .subInlineWithClassRegeneration(
                                                                            inliningContext.nameGenerator,
                                                                            currentTypeMapping,
-                                                                           anonymousObjectGen,
                                                                            inlineCallSiteInfo),
                                                            isSameModule, Type.getObjectType(newClassName)
                             );
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
index 1e0f1bfd750..27b39044efb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
@@ -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;
     }