For-loop range expression (collection) can not be null

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java

@@ -332,18 +332,6 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         Call iteratorCall = calls.getFirst();
         OverloadResolutionResults<FunctionDescriptor> iteratorResolutionResults = calls.getSecond();
 
-        // We allow the loop range to be null (nothing happens), so we make the receiver type non-null
-        if (!iteratorResolutionResults.isSuccess()) {
-            ExpressionReceiver nonNullReceiver = new ExpressionReceiver(loopRange.getExpression(), TypeUtils.makeNotNullable(loopRange.getType()));
-            Pair<Call,OverloadResolutionResults<FunctionDescriptor>> callsNonNull = makeAndResolveFakeCall(nonNullReceiver, context, iterator);
-            Call iteratorCallWithNonNullReceiver = callsNonNull.getFirst();
-            OverloadResolutionResults<FunctionDescriptor> iteratorResolutionResultsWithNonNullReceiver = callsNonNull.getSecond();
-            if (iteratorResolutionResultsWithNonNullReceiver.isSuccess()) {
-                iteratorResolutionResults = iteratorResolutionResultsWithNonNullReceiver;
-                iteratorCall = iteratorCallWithNonNullReceiver;
-            }
-        }
-        
         if (iteratorResolutionResults.isSuccess()) {
             ResolvedCall<FunctionDescriptor> iteratorResolvedCall = iteratorResolutionResults.getResultingCall();
             context.trace.record(LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRangeExpression, iteratorResolvedCall);

compiler/testData/codegen/controlStructures/forNullableIntArray.jet

@@ -12,10 +12,5 @@ fun box() : String {
     System.out?.println(sum)
     if(sum != 10) return "b failed"
 
-    val d : Array<Int?>? = null
-    for (el in d) {
-        sum = sum + (el ?: 7)
-    }
-
     return "OK"
 }

compiler/testData/codegen/controlStructures/forPrimitiveIntArray.jet

@@ -10,10 +10,5 @@ fun box() : String {
     }
     if(sum != 10) return "a failed"
 
-    val b : IntArray? = null
-    for (el in b) {
-        sum = sum + el
-    }
-
     return "OK"
 }

compiler/testData/codegen/regressions/kt1482_2279.kt

@@ -2,7 +2,7 @@ abstract class ClassValAbstract {
     abstract var a: Int
 
     class object {
-        val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods()
+        val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods()!!
     }
 }
 

compiler/testData/codegen/regressions/kt1932.kt

@@ -11,7 +11,7 @@ class Test() {
 
 fun box(): String {
     val test = Test()
-    for (method in javaClass<Test>().getMethods()) {
+    for (method in javaClass<Test>().getMethods()!!) {
         val anns = method?.getAnnotations() as Array<Annotation>
         if (!anns.isEmpty()) {
             for (ann in anns) {

compiler/testData/codegen/regressions/kt237.jet

@@ -17,7 +17,7 @@ fun <T> fff(x: T) : T { return x }
 
 fun <T> id(value: T): T = value
 
-fun foreach(array: Array<Int>?, action: (Int)-> Unit) {
+fun foreach(array: Array<Int>, action: (Int)-> Unit) {
     for (el in array) {
        action(el) //exception through compilation (see below)
     }

compiler/testData/codegen/regressions/kt903.jet

@@ -5,7 +5,7 @@ fun Int.plus(a: Int?) = this + a.sure()
 
 public open class PerfectNumberFinder() {
         open public fun isPerfect(number : Int) : Boolean {
-            var factors : List<Int?>? = ArrayList<Int?>()
+            var factors : List<Int?> = ArrayList<Int?>()
             factors?.add(1)
             factors?.add(number)
             for (i in 2..(Math.sqrt((number).toDouble()) - 1).toInt())

compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt

@@ -0,0 +1,16 @@
+class Coll {
+  fun iterator(): It = It()
+}
+
+class It {
+  fun next() = 1
+  fun hasNext() = false
+}
+
+fun test(c: Coll?) {
+  for (x in <!ITERATOR_MISSING!>c<!>) {}
+
+  if (c != null) {
+    for(x in c) {}
+  }
+}

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java

@@ -874,6 +874,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/controlStructures"), "kt", false);
             }
             
+            @TestMetadata("forLoopWithNullableRange.kt")
+            public void testForLoopWithNullableRange() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt");
+            }
+            
             @TestMetadata("ForWithoutBraces.kt")
             public void testForWithoutBraces() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.kt");