Android Extensions: Support smart-casted receivers (KT-18545)

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AbstractAndroidExtensionsExpressionCodegenExtension.kt

@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassOrAny
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
+import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PRIVATE
 import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
@@ -128,7 +129,23 @@ abstract class AbstractAndroidExtensionsExpressionCodegenExtension : ExpressionC
     }
 
     private fun ResolvedCall<*>.getReceiverDeclarationDescriptor(): ClassifierDescriptor? {
-        return (extensionReceiver as ReceiverValue).type.constructor.declarationDescriptor
+        val fromDeclarationSite = resultingDescriptor.extensionReceiverParameter?.type?.constructor?.declarationDescriptor
+        val fromCallSite = (extensionReceiver as ReceiverValue).type.constructor.declarationDescriptor
+
+        if (fromDeclarationSite == null && fromCallSite == null)
+            return null
+        else if (fromDeclarationSite != null && fromCallSite == null)
+            return fromDeclarationSite
+        else if (fromDeclarationSite == null && fromCallSite != null)
+            return fromCallSite
+
+        fromDeclarationSite as ClassifierDescriptor
+        fromCallSite as ClassifierDescriptor
+
+        return if (fromCallSite.defaultType.isSubtypeOf(fromDeclarationSite.defaultType))
+            fromCallSite
+        else
+            fromDeclarationSite
     }
 
     override fun generateClassSyntheticParts(codegen: ImplementationBodyCodegen) {

plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/kt18545/kt18545.kt

@@ -0,0 +1,11 @@
+package test
+
+import android.app.Activity
+import android.os.Bundle
+import java.io.File
+import kotlinx.android.synthetic.main.layout.*
+
+fun test(obj: Any?) {
+    obj as Activity
+    obj.login
+}

plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/kt18545/res/layout/layout.xml

@@ -0,0 +1,17 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:id="@+id/item_detail_container"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign in" />
+
+</FrameLayout>

plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java

@@ -120,6 +120,12 @@ public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeSh
         doTest(fileName);
     }
 
+    @TestMetadata("kt18545")
+    public void testKt18545() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/kt18545/");
+        doTest(fileName);
+    }
+
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/");