KT-309

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

@@ -317,6 +317,9 @@ public class JetTypeMapper {
         if (jetType.equals(JetStandardClasses.getUnitType()) || jetType.equals(JetStandardClasses.getNothingType())) {
             return Type.VOID_TYPE;
         }
+        if (jetType.equals(JetStandardClasses.getNullableNothingType())) {
+            return TYPE_OBJECT;
+        }
         return mapType(jetType, kind);
     }
 

idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java

@@ -178,4 +178,11 @@ public class ClassGenTest extends CodegenTestCase {
         blackBoxFile("regressions/kt48.jet");
         System.out.println(generateToText());
     }
+
+    public void testKt309 () throws Exception {
+        loadText("fun box() = null");
+        final Method method = generateFunction("box");
+        assertEquals(method.getReturnType().getName(), "java.lang.Object");
+        System.out.println(generateToText());
+    }
 }