returnTypeNullable in flags duplicates info in returnType annotation field

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

@@ -356,8 +356,6 @@ public class FunctionCodegen extends GenerationStateAware {
             }
             kotlinFlags |= DescriptorKindUtils.kindToFlags(functionDescriptor.getKind());
             //noinspection ConstantConditions
-            if (functionDescriptor.getReturnType().isNullable())
-                kotlinFlags |= JvmStdlibNames.FLAG_NULLABLE_RETURN_TYPE_BIT;
             aw.writeFlags(kotlinFlags);
             aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
             aw.writeReturnType(jvmSignature.getKotlinReturnType());

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

@@ -1225,8 +1225,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                 else {
                     JetType returnType = fun.getReturnType();
                     assert returnType != null;
-                    if (returnType.isNullable())
-                        kotlinFlags |= JvmStdlibNames.FLAG_NULLABLE_RETURN_TYPE_BIT;
                     aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
                     aw.writeReturnType(jvmSignature.getKotlinReturnType());
                 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -1879,10 +1879,8 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
             transformedType = semanticServices.getTypeTransformer().transformToType(
                     returnType, JavaTypeTransformer.TypeUsage.MEMBER_SIGNATURE_COVARIANT, typeVariableResolver);
         }
-        if (method.getJetMethod().returnTypeNullable()) {
+
-            return TypeUtils.makeNullableAsSpecified(transformedType, true);
+        if (findAnnotation(method.getPsiMethod(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) {
-        }
-        else if (findAnnotation(method.getPsiMethod(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) {
             return TypeUtils.makeNullableAsSpecified(transformedType, false);
         }
         else {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java

@@ -52,14 +52,13 @@ public class JvmStdlibNames {
     public static final int FLAG_FORCE_FINAL_BIT = 1 << 2;
     public static final int FLAG_PRIVATE_BIT =  1 << 3;
     public static final int FLAG_INTERNAL_BIT = 1 << 4;
-    public static final int FLAG_NULLABLE_RETURN_TYPE_BIT = 1 << 5;
 
     // three bits (one reserved)
-    public static final int FLAG_KIND_MASK = 7 << 6;
+    public static final int FLAG_KIND_MASK = 7 << 5;
-    public static final int FLAG_KIND_DECLARATION =   0 << 6;
+    public static final int FLAG_KIND_DECLARATION =   0 << 5;
-    public static final int FLAG_KIND_FAKE_OVERRIDE = 1 << 6;
+    public static final int FLAG_KIND_FAKE_OVERRIDE = 1 << 5;
-    public static final int FLAG_KIND_DELEGATION =    2 << 6;
+    public static final int FLAG_KIND_DELEGATION =    2 << 5;
-    public static final int FLAG_KIND_SYNTHESIZED =   3 << 6;
+    public static final int FLAG_KIND_SYNTHESIZED =   3 << 5;
 
     public static final JvmClassName JET_CONSTRUCTOR = JvmClassName.byFqNameWithoutInnerClasses("jet.runtime.typeinfo.JetConstructor");
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java

@@ -79,19 +79,21 @@ public class PsiClassFinderImpl implements PsiClassFinder {
             return null;
         }
 
-        PsiAnnotation assertInvisibleAnnotation = JavaDescriptorResolver
+        if ("jet".equals(qualifiedName.parent().getFqName())) {
-                .findAnnotation(original, JvmStdlibNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().getFqName());
+            PsiAnnotation assertInvisibleAnnotation = JavaDescriptorResolver
-        if (assertInvisibleAnnotation != null) {
+                    .findAnnotation(original, JvmStdlibNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().getFqName());
-            if (runtimeClassesHandleMode == RuntimeClassesHandleMode.IGNORE) {
+            if (assertInvisibleAnnotation != null) {
-                return null;
+                if (runtimeClassesHandleMode == RuntimeClassesHandleMode.IGNORE) {
-            }
+                    return null;
-            else if (runtimeClassesHandleMode == RuntimeClassesHandleMode.THROW) {
+                }
-                throw new IllegalStateException(
+                else if (runtimeClassesHandleMode == RuntimeClassesHandleMode.THROW) {
-                        "classpath is configured incorrectly:" +
+                    throw new IllegalStateException(
-                        " class " + qualifiedName + " from runtime must not be loaded by compiler");
+                            "classpath is configured incorrectly:" +
-            }
+                            " class " + qualifiedName + " from runtime must not be loaded by compiler");
-            else {
+                }
-                throw new IllegalStateException("unknown parameter value: " + runtimeClassesHandleMode);
+                else {
+                    throw new IllegalStateException("unknown parameter value: " + runtimeClassesHandleMode);
+                }
             }
         }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java

@@ -61,10 +61,6 @@ public class JetMethodAnnotation extends PsiAnnotationWithFlags {
         return returnType;
     }
 
-    public boolean returnTypeNullable() {
-        return (flags() & JvmStdlibNames.FLAG_NULLABLE_RETURN_TYPE_BIT) != 0;
-    }
-
     @NotNull
     public String propertyType() {
         checkInitialized();