diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index b5cf22520c1..2088de85011 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -120,10 +120,13 @@ public class AnnotationResolver { List valueArguments = descriptorToArgument.getValue().getArguments(); ValueParameterDescriptor parameterDescriptor = descriptorToArgument.getKey(); for (ValueArgument argument : valueArguments) { - CompileTimeConstant compileTimeConstant = - resolveAnnotationArgument(argument.getArgumentExpression(), parameterDescriptor.getType(), trace); - if (compileTimeConstant != null) { - descriptor.setValueArgument(parameterDescriptor, compileTimeConstant); + JetExpression argumentExpression = argument.getArgumentExpression(); + if (argumentExpression != null) { + CompileTimeConstant compileTimeConstant = + resolveAnnotationArgument(argumentExpression, parameterDescriptor.getType(), trace); + if (compileTimeConstant != null) { + descriptor.setValueArgument(parameterDescriptor, compileTimeConstant); + } } } }