Fix safe call

compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java

@@ -3565,7 +3565,7 @@ The "returned" value of try expression with no finally is either the last expres
             DeclarationDescriptor descriptor = rightType.getConstructor().getDeclarationDescriptor();
             if (descriptor instanceof ClassDescriptor || descriptor instanceof TypeParameterDescriptor) {
                 StackValue value = genQualified(receiver, left);
-                value.put(boxType(rightTypeAsm), v);
+                value.put(boxType(value.type), v);
 
                 if (opToken != JetTokens.AS_SAFE) {
                     if (!CodegenUtil.isNullableType(rightType)) {

compiler/testData/codegen/box/casts/asSafeFail.kt

@@ -0,0 +1,16 @@
+class A
+class B
+
+fun box(): String {
+    val a = A()
+    a as? B
+    a as? B ?: "fail"
+
+    if ((A() as? B) != null) return "fail1"
+    if ((a as? B) != null) return "fail2"
+
+    val v = a as? B ?: "fail"
+    if (v != "fail") return "fail4"
+
+    return "OK"
+}

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java

@@ -733,6 +733,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest("compiler/testData/codegen/box/casts/asSafe.kt");
         }
         
+        @TestMetadata("asSafeFail.kt")
+        public void testAsSafeFail() throws Exception {
+            doTest("compiler/testData/codegen/box/casts/asSafeFail.kt");
+        }
+        
         @TestMetadata("castGenericNull.kt")
         public void testCastGenericNull() throws Exception {
             doTest("compiler/testData/codegen/box/casts/castGenericNull.kt");