Test fixed for KT-689 Allow to put Java and Kotlin files in the same packages

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

@@ -6,6 +6,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;

compiler/testData/diagnostics/tests/MergePackagesWithJava.jet

@@ -1,3 +1,4 @@
+// +JDK
 // KT-689 Allow to put Java and Kotlin files in the same packages
 
 // This is a stub test. One should not extend Java packages that come from libraries.