diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 7508eabf79c..d10325fb990 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -386,7 +386,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         genClosureFields(context.closure, v, typeMapper);
 
         for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.Default.getInstances(state.getProject())) {
-            extension.generateClassSyntheticParts(v, bindingContext, myClass, descriptor);
+            extension.generateClassSyntheticParts(v, state, myClass, descriptor);
         }
     }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
index 823a7649862..4e031c4d2d0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
@@ -22,6 +22,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.codegen.ClassBuilder
+import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.resolve.*
@@ -39,7 +40,7 @@ public trait ExpressionCodegenExtension {
 
     public fun generateClassSyntheticParts(
             classBuilder: ClassBuilder,
-            bindingContext: BindingContext,
+            state: GenerationState,
             classOrObject: JetClassOrObject,
             descriptor: ClassDescriptor
     ) {}
diff --git a/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt b/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
index 0bcdaa90ef0..b7bceb3cb96 100644
--- a/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
+++ b/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.FunctionCodegen
 import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
+import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -135,7 +136,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
 
     override fun generateClassSyntheticParts(
             classBuilder: ClassBuilder,
-            bindingContext: BindingContext,
+            state: GenerationState,
             classOrObject: JetClassOrObject,
             descriptor: ClassDescriptor
     ) {
@@ -145,7 +146,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
         val androidClassType = getClassType(descriptor)
         if (androidClassType == AndroidClassType.UNKNOWN) return
 
-        val classType = JetTypeMapper(bindingContext, ClassBuilderMode.FULL).mapClass(descriptor)
+        val classType = state.getTypeMapper().mapClass(descriptor)
         val className = classType.getInternalName()
 
         val viewType = Type.getObjectType("android/view/View")