Merge remote-tracking branch 'origin/master'

compiler/testData/codegen/regressions/kt1649_1.kt

@@ -0,0 +1,9 @@
+trait A {
+    val method : (() -> Unit)?
+}
+
+fun test(a : A) {
+    if (a.method != null) {
+        a.method!!()
+    }
+}

compiler/testData/codegen/regressions/kt1649_2.kt

@@ -0,0 +1,9 @@
+trait A {
+    val method : () -> Unit?
+}
+
+fun test(a : A) {
+    if (a.method != null) {
+        a.method!!()
+    }
+}

compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java

@@ -149,6 +149,16 @@ public class FunctionGenTest extends CodegenTestCase {
         blackBoxFile("regressions/kt2270.kt");
     }
 
+    public void testK1649_1() {
+        loadFile("regressions/kt1649_1.kt");
+        generateToText();
+    }
+
+    public void testK1649_2() {
+        loadFile("regressions/kt1649_2.kt");
+        generateToText();
+    }
+
     public static class WithJavaFunctionGenTest extends CodegenTestCase {
         private void blackBoxFileWithJava(@NotNull String ktFile) throws Exception {
             File javaClassesTempDirectory = new File(FileUtil.getTempDirectory(), "java-classes");