diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 9b7ee1c12df..4d084db32e9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -371,7 +371,6 @@ public class FunctionCodegen extends GenerationStateAware { if (receiverParameter.exists()) { JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, start++); av.writeName("this$receiver"); - av.writeNullable(receiverParameter.getType().isNullable()); av.writeReceiver(); if (kotlinParameterTypes.get(0) != null) { av.writeType(kotlinParameterTypes.get(0).getKotlinSignature()); @@ -384,7 +383,6 @@ public class FunctionCodegen extends GenerationStateAware { JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, i + start); av.writeName(parameterDescriptor.getName().getName()); av.writeHasDefaultValue(parameterDescriptor.declaresDefaultValue()); - av.writeNullable(parameterDescriptor.getType().isNullable()); if (kotlinParameterTypes.get(i) != null) { av.writeType(kotlinParameterTypes.get(i + start).getKotlinSignature()); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java b/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java index da343bd3aae..aa8a4c6f13d 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java @@ -42,12 +42,6 @@ public class JetValueParameterAnnotationWriter { mv.visitParameterAnnotation(n, JvmStdlibNames.JET_VALUE_PARAMETER.getDescriptor(), true)); } - public void writeNullable(boolean nullable) { - if (nullable) { - av.visit(JvmStdlibNames.JET_VALUE_PARAMETER_NULLABLE_FIELD, true); - } - } - public void writeReceiver() { av.visit(JvmStdlibNames.JET_VALUE_PARAMETER_RECEIVER_FIELD, true); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index d827e475e3b..67559b6e05b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -997,10 +997,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes else { JetType transformedType; - if (parameter.getJetValueParameter().nullable()) { - transformedType = TypeUtils.makeNullableAsSpecified(outType, parameter.getJetValueParameter().nullable()); - } - else if (findAnnotation(parameter.getPsiParameter(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) { + if (findAnnotation(parameter.getPsiParameter(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) { transformedType = TypeUtils.makeNullableAsSpecified(outType, false); } else { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java index 1294df38ad6..9bd694cf5b0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java @@ -37,7 +37,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper { private String name; private String type; - private boolean nullable; private boolean receiver; private boolean hasDefaultValue; @@ -45,7 +44,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper { protected void initialize() { name = getStringAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_NAME_FIELD, ""); type = getStringAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_TYPE_FIELD, ""); - nullable = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_NULLABLE_FIELD, false); receiver = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_RECEIVER_FIELD, false); hasDefaultValue = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_HAS_DEFAULT_VALUE_FIELD, false); } @@ -62,11 +60,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper { return type; } - public boolean nullable() { - checkInitialized(); - return nullable; - } - public boolean receiver() { checkInitialized(); return receiver; diff --git a/runtime/src/jet/runtime/typeinfo/JetValueParameter.java b/runtime/src/jet/runtime/typeinfo/JetValueParameter.java index bd77d680bb2..50b7874a11f 100644 --- a/runtime/src/jet/runtime/typeinfo/JetValueParameter.java +++ b/runtime/src/jet/runtime/typeinfo/JetValueParameter.java @@ -42,6 +42,7 @@ public @interface JetValueParameter { JetTypeProjection[] typeProjections() default {}; /** + * @deprecated info contained in type field * @return is this type nullable */ boolean nullable () default false;