From 387d16d1d50455c2e5372dc5c40dac2f23f1c44a Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Tue, 8 Sep 2015 07:24:32 +0300
Subject: [PATCH] Regenerate RangesCodegenTest

---
 .../ranges/expression/emptyDownto.kt          |  1 -
 .../ranges/expression/emptyRange.kt           |  1 -
 .../expression/inexactDownToMinValue.kt       |  1 -
 .../ranges/expression/inexactSteppedDownTo.kt |  1 -
 .../ranges/expression/inexactSteppedRange.kt  |  1 -
 .../ranges/expression/inexactToMaxValue.kt    |  1 -
 .../ranges/expression/infiniteSteps.kt        | 17 +++----
 .../expression/maxValueMinusTwoToMaxValue.kt  |  1 -
 .../ranges/expression/maxValueToMaxValue.kt   |  1 -
 .../ranges/expression/maxValueToMinValue.kt   |  1 -
 .../ranges/expression/nanEnds.kt              | 49 +++++++++----------
 .../ranges/expression/oneElementDownTo.kt     |  1 -
 .../ranges/expression/oneElementRange.kt      |  1 -
 .../ranges/expression/openRange.kt            |  1 -
 .../expression/progressionDownToMinValue.kt   |  1 -
 .../progressionMaxValueMinusTwoToMaxValue.kt  |  1 -
 .../progressionMaxValueToMaxValue.kt          |  1 -
 .../progressionMaxValueToMinValue.kt          |  1 -
 .../progressionMinValueToMinValue.kt          |  1 -
 .../ranges/expression/reversedBackSequence.kt |  1 -
 .../expression/reversedEmptyBackSequence.kt   |  1 -
 .../ranges/expression/reversedEmptyRange.kt   |  1 -
 .../reversedInexactSteppedDownTo.kt           |  1 -
 .../ranges/expression/reversedRange.kt        |  1 -
 .../expression/reversedSimpleSteppedRange.kt  |  1 -
 .../ranges/expression/simpleDownTo.kt         |  1 -
 .../ranges/expression/simpleRange.kt          |  1 -
 .../simpleRangeWithNonConstantEnds.kt         |  1 -
 .../ranges/expression/simpleSteppedDownTo.kt  |  1 -
 .../ranges/expression/simpleSteppedRange.kt   |  1 -
 .../ranges/literal/emptyDownto.kt             |  1 -
 .../ranges/literal/emptyRange.kt              |  1 -
 .../ranges/literal/inexactDownToMinValue.kt   |  1 -
 .../ranges/literal/inexactSteppedDownTo.kt    |  1 -
 .../ranges/literal/inexactSteppedRange.kt     |  1 -
 .../ranges/literal/inexactToMaxValue.kt       |  1 -
 .../ranges/literal/infiniteSteps.kt           | 17 +++----
 .../literal/maxValueMinusTwoToMaxValue.kt     |  1 -
 .../ranges/literal/maxValueToMaxValue.kt      |  1 -
 .../ranges/literal/maxValueToMinValue.kt      |  1 -
 .../boxWithStdlib/ranges/literal/nanEnds.kt   | 49 +++++++++----------
 .../ranges/literal/oneElementDownTo.kt        |  1 -
 .../ranges/literal/oneElementRange.kt         |  1 -
 .../boxWithStdlib/ranges/literal/openRange.kt |  1 -
 .../literal/progressionDownToMinValue.kt      |  1 -
 .../progressionMaxValueMinusTwoToMaxValue.kt  |  1 -
 .../literal/progressionMaxValueToMaxValue.kt  |  1 -
 .../literal/progressionMaxValueToMinValue.kt  |  1 -
 .../literal/progressionMinValueToMinValue.kt  |  1 -
 .../ranges/literal/reversedBackSequence.kt    |  1 -
 .../literal/reversedEmptyBackSequence.kt      |  1 -
 .../ranges/literal/reversedEmptyRange.kt      |  1 -
 .../literal/reversedInexactSteppedDownTo.kt   |  1 -
 .../ranges/literal/reversedRange.kt           |  1 -
 .../literal/reversedSimpleSteppedRange.kt     |  1 -
 .../ranges/literal/simpleDownTo.kt            |  1 -
 .../ranges/literal/simpleRange.kt             |  1 -
 .../literal/simpleRangeWithNonConstantEnds.kt |  1 -
 .../ranges/literal/simpleSteppedDownTo.kt     |  1 -
 .../ranges/literal/simpleSteppedRange.kt      |  1 -
 .../tests/GenerateRangesCodegenTestData.java  |  1 -
 61 files changed, 64 insertions(+), 125 deletions(-)

diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
index 0cd6d398885..f9adcee76dc 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
index 2b75707b6b8..50cbfbd0dcb 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
index f4d26ce7d35..4ed6d550031 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
index 1de8f2e4bb2..394f917c912 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
index c9bbe5ed49c..405bb3b4319 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
index d5befa8aa5a..a8ca4cb6884 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt
index aa80796c77c..08727806e61 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt
@@ -1,46 +1,45 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Double>()
-    val range1 = 0.0..5.0 step j.Double.POSITIVE_INFINITY
+    val range1 = 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY
     for (i in range1) {
         list1.add(i)
         if (list1.size() > 23) break
     }
     if (list1 != listOf<Double>(0.0)) {
-        return "Wrong elements for 0.0..5.0 step j.Double.POSITIVE_INFINITY: $list1"
+        return "Wrong elements for 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY: $list1"
     }
 
     val list2 = ArrayList<Float>()
-    val range2 = 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY
+    val range2 = 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
     if (list2 != listOf<Float>(0.0.toFloat())) {
-        return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY: $list2"
+        return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list2"
     }
 
     val list3 = ArrayList<Double>()
-    val range3 = 5.0 downTo 0.0 step j.Double.POSITIVE_INFINITY
+    val range3 = 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
     if (list3 != listOf<Double>(5.0)) {
-        return "Wrong elements for 5.0 downTo 0.0 step j.Double.POSITIVE_INFINITY: $list3"
+        return "Wrong elements for 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY: $list3"
     }
 
     val list4 = ArrayList<Float>()
-    val range4 = 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY
+    val range4 = 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY
     for (i in range4) {
         list4.add(i)
         if (list4.size() > 23) break
     }
     if (list4 != listOf<Float>(5.0.toFloat())) {
-        return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY: $list4"
+        return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list4"
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
index 3ee48b17dde..669d851579b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
index dc8f63a7c38..2a5c2a7e6e4 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
index ccd8befeccc..3d3c9672c7f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt
index ff4e2cd3662..dfdafbad7df 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt
@@ -1,126 +1,125 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Double>()
-    val range1 = j.Double.NaN..5.0
+    val range1 = java.lang.Double.NaN..5.0
     for (i in range1) {
         list1.add(i)
         if (list1.size() > 23) break
     }
     if (list1 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN..5.0: $list1"
+        return "Wrong elements for java.lang.Double.NaN..5.0: $list1"
     }
 
     val list2 = ArrayList<Float>()
-    val range2 = j.Float.NaN.toFloat()..5.0.toFloat()
+    val range2 = java.lang.Float.NaN.toFloat()..5.0.toFloat()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
     if (list2 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN.toFloat()..5.0.toFloat(): $list2"
+        return "Wrong elements for java.lang.Float.NaN.toFloat()..5.0.toFloat(): $list2"
     }
 
     val list3 = ArrayList<Double>()
-    val range3 = j.Double.NaN downTo 0.0
+    val range3 = java.lang.Double.NaN downTo 0.0
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
     if (list3 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN downTo 0.0: $list3"
+        return "Wrong elements for java.lang.Double.NaN downTo 0.0: $list3"
     }
 
     val list4 = ArrayList<Float>()
-    val range4 = j.Float.NaN.toFloat() downTo 0.0.toFloat()
+    val range4 = java.lang.Float.NaN.toFloat() downTo 0.0.toFloat()
     for (i in range4) {
         list4.add(i)
         if (list4.size() > 23) break
     }
     if (list4 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN.toFloat() downTo 0.0.toFloat(): $list4"
+        return "Wrong elements for java.lang.Float.NaN.toFloat() downTo 0.0.toFloat(): $list4"
     }
 
     val list5 = ArrayList<Double>()
-    val range5 = 0.0..j.Double.NaN
+    val range5 = 0.0..java.lang.Double.NaN
     for (i in range5) {
         list5.add(i)
         if (list5.size() > 23) break
     }
     if (list5 != listOf<Double>()) {
-        return "Wrong elements for 0.0..j.Double.NaN: $list5"
+        return "Wrong elements for 0.0..java.lang.Double.NaN: $list5"
     }
 
     val list6 = ArrayList<Float>()
-    val range6 = 0.0.toFloat()..j.Float.NaN
+    val range6 = 0.0.toFloat()..java.lang.Float.NaN
     for (i in range6) {
         list6.add(i)
         if (list6.size() > 23) break
     }
     if (list6 != listOf<Float>()) {
-        return "Wrong elements for 0.0.toFloat()..j.Float.NaN: $list6"
+        return "Wrong elements for 0.0.toFloat()..java.lang.Float.NaN: $list6"
     }
 
     val list7 = ArrayList<Double>()
-    val range7 = 5.0 downTo j.Double.NaN
+    val range7 = 5.0 downTo java.lang.Double.NaN
     for (i in range7) {
         list7.add(i)
         if (list7.size() > 23) break
     }
     if (list7 != listOf<Double>()) {
-        return "Wrong elements for 5.0 downTo j.Double.NaN: $list7"
+        return "Wrong elements for 5.0 downTo java.lang.Double.NaN: $list7"
     }
 
     val list8 = ArrayList<Float>()
-    val range8 = 5.0.toFloat() downTo j.Float.NaN
+    val range8 = 5.0.toFloat() downTo java.lang.Float.NaN
     for (i in range8) {
         list8.add(i)
         if (list8.size() > 23) break
     }
     if (list8 != listOf<Float>()) {
-        return "Wrong elements for 5.0.toFloat() downTo j.Float.NaN: $list8"
+        return "Wrong elements for 5.0.toFloat() downTo java.lang.Float.NaN: $list8"
     }
 
     val list9 = ArrayList<Double>()
-    val range9 = j.Double.NaN..j.Double.NaN
+    val range9 = java.lang.Double.NaN..java.lang.Double.NaN
     for (i in range9) {
         list9.add(i)
         if (list9.size() > 23) break
     }
     if (list9 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN..j.Double.NaN: $list9"
+        return "Wrong elements for java.lang.Double.NaN..java.lang.Double.NaN: $list9"
     }
 
     val list10 = ArrayList<Float>()
-    val range10 = j.Float.NaN..j.Float.NaN
+    val range10 = java.lang.Float.NaN..java.lang.Float.NaN
     for (i in range10) {
         list10.add(i)
         if (list10.size() > 23) break
     }
     if (list10 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN..j.Float.NaN: $list10"
+        return "Wrong elements for java.lang.Float.NaN..java.lang.Float.NaN: $list10"
     }
 
     val list11 = ArrayList<Double>()
-    val range11 = j.Double.NaN downTo j.Double.NaN
+    val range11 = java.lang.Double.NaN downTo java.lang.Double.NaN
     for (i in range11) {
         list11.add(i)
         if (list11.size() > 23) break
     }
     if (list11 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN downTo j.Double.NaN: $list11"
+        return "Wrong elements for java.lang.Double.NaN downTo java.lang.Double.NaN: $list11"
     }
 
     val list12 = ArrayList<Float>()
-    val range12 = j.Float.NaN downTo j.Float.NaN
+    val range12 = java.lang.Float.NaN downTo java.lang.Float.NaN
     for (i in range12) {
         list12.add(i)
         if (list12.size() > 23) break
     }
     if (list12 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN downTo j.Float.NaN: $list12"
+        return "Wrong elements for java.lang.Float.NaN downTo java.lang.Float.NaN: $list12"
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
index 0cf165cb6e7..6a83e45ef2f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
index 1098e05d86b..b3aef7205ed 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
index b31318a2a70..d89edd60435 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
index 1531e67511c..e7e5927b7e0 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
index 9d9f13d7349..f97b407a714 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
index 31242cb303a..427154cd798 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
index 5b0fa8a6319..1e613013174 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
index d71b7ad8773..2717c0dda96 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
index eeb0acce7e3..c4b5826c7a0 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
index 7206e15a250..c2d404693be 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
index 6361de7d7df..24d64f2d559 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
index 211ab292af2..c978600e86a 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
index 146ab3a498f..5354a46ada4 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
index e0d555c068e..2cfc2563a57 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
index f9e27c9aecc..e7bea87bb83 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
index 0d16499e278..76ca8d67a44 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
index 722119f8472..eab200b697e 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
index 6708aa49d03..051adb337d4 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
index d2f964c42e7..3c6e368e37b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
index 54df0cca715..3d08f8ba9a3 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
index e75c84012ef..b6b4f6c9b88 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
index c8b9e14014d..3305e36037f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
index f1f53d0d1d9..8e83a2eb977 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
index c3c9753da89..f384e0fce8b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
index fc4b412712b..a76bec48e96 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt
index 27cd4bcaae4..e3c50449324 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt
@@ -1,42 +1,41 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Double>()
-    for (i in 0.0..5.0 step j.Double.POSITIVE_INFINITY) {
+    for (i in 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY) {
         list1.add(i)
         if (list1.size() > 23) break
     }
     if (list1 != listOf<Double>(0.0)) {
-        return "Wrong elements for 0.0..5.0 step j.Double.POSITIVE_INFINITY: $list1"
+        return "Wrong elements for 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY: $list1"
     }
 
     val list2 = ArrayList<Float>()
-    for (i in 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY) {
+    for (i in 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY) {
         list2.add(i)
         if (list2.size() > 23) break
     }
     if (list2 != listOf<Float>(0.0.toFloat())) {
-        return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY: $list2"
+        return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list2"
     }
 
     val list3 = ArrayList<Double>()
-    for (i in 5.0 downTo 0.0 step j.Double.POSITIVE_INFINITY) {
+    for (i in 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY) {
         list3.add(i)
         if (list3.size() > 23) break
     }
     if (list3 != listOf<Double>(5.0)) {
-        return "Wrong elements for 5.0 downTo 0.0 step j.Double.POSITIVE_INFINITY: $list3"
+        return "Wrong elements for 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY: $list3"
     }
 
     val list4 = ArrayList<Float>()
-    for (i in 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY) {
+    for (i in 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY) {
         list4.add(i)
         if (list4.size() > 23) break
     }
     if (list4 != listOf<Float>(5.0.toFloat())) {
-        return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY: $list4"
+        return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list4"
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
index 716ea1cc300..669b031a4db 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
index 1eb795d9fd6..30caebd8074 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
index a43ec1e22b1..4236c2de0e1 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt
index f89ed209f38..7943ad700b6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt
@@ -1,114 +1,113 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Double>()
-    for (i in j.Double.NaN..5.0) {
+    for (i in java.lang.Double.NaN..5.0) {
         list1.add(i)
         if (list1.size() > 23) break
     }
     if (list1 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN..5.0: $list1"
+        return "Wrong elements for java.lang.Double.NaN..5.0: $list1"
     }
 
     val list2 = ArrayList<Float>()
-    for (i in j.Float.NaN.toFloat()..5.0.toFloat()) {
+    for (i in java.lang.Float.NaN.toFloat()..5.0.toFloat()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
     if (list2 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN.toFloat()..5.0.toFloat(): $list2"
+        return "Wrong elements for java.lang.Float.NaN.toFloat()..5.0.toFloat(): $list2"
     }
 
     val list3 = ArrayList<Double>()
-    for (i in j.Double.NaN downTo 0.0) {
+    for (i in java.lang.Double.NaN downTo 0.0) {
         list3.add(i)
         if (list3.size() > 23) break
     }
     if (list3 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN downTo 0.0: $list3"
+        return "Wrong elements for java.lang.Double.NaN downTo 0.0: $list3"
     }
 
     val list4 = ArrayList<Float>()
-    for (i in j.Float.NaN.toFloat() downTo 0.0.toFloat()) {
+    for (i in java.lang.Float.NaN.toFloat() downTo 0.0.toFloat()) {
         list4.add(i)
         if (list4.size() > 23) break
     }
     if (list4 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN.toFloat() downTo 0.0.toFloat(): $list4"
+        return "Wrong elements for java.lang.Float.NaN.toFloat() downTo 0.0.toFloat(): $list4"
     }
 
     val list5 = ArrayList<Double>()
-    for (i in 0.0..j.Double.NaN) {
+    for (i in 0.0..java.lang.Double.NaN) {
         list5.add(i)
         if (list5.size() > 23) break
     }
     if (list5 != listOf<Double>()) {
-        return "Wrong elements for 0.0..j.Double.NaN: $list5"
+        return "Wrong elements for 0.0..java.lang.Double.NaN: $list5"
     }
 
     val list6 = ArrayList<Float>()
-    for (i in 0.0.toFloat()..j.Float.NaN) {
+    for (i in 0.0.toFloat()..java.lang.Float.NaN) {
         list6.add(i)
         if (list6.size() > 23) break
     }
     if (list6 != listOf<Float>()) {
-        return "Wrong elements for 0.0.toFloat()..j.Float.NaN: $list6"
+        return "Wrong elements for 0.0.toFloat()..java.lang.Float.NaN: $list6"
     }
 
     val list7 = ArrayList<Double>()
-    for (i in 5.0 downTo j.Double.NaN) {
+    for (i in 5.0 downTo java.lang.Double.NaN) {
         list7.add(i)
         if (list7.size() > 23) break
     }
     if (list7 != listOf<Double>()) {
-        return "Wrong elements for 5.0 downTo j.Double.NaN: $list7"
+        return "Wrong elements for 5.0 downTo java.lang.Double.NaN: $list7"
     }
 
     val list8 = ArrayList<Float>()
-    for (i in 5.0.toFloat() downTo j.Float.NaN) {
+    for (i in 5.0.toFloat() downTo java.lang.Float.NaN) {
         list8.add(i)
         if (list8.size() > 23) break
     }
     if (list8 != listOf<Float>()) {
-        return "Wrong elements for 5.0.toFloat() downTo j.Float.NaN: $list8"
+        return "Wrong elements for 5.0.toFloat() downTo java.lang.Float.NaN: $list8"
     }
 
     val list9 = ArrayList<Double>()
-    for (i in j.Double.NaN..j.Double.NaN) {
+    for (i in java.lang.Double.NaN..java.lang.Double.NaN) {
         list9.add(i)
         if (list9.size() > 23) break
     }
     if (list9 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN..j.Double.NaN: $list9"
+        return "Wrong elements for java.lang.Double.NaN..java.lang.Double.NaN: $list9"
     }
 
     val list10 = ArrayList<Float>()
-    for (i in j.Float.NaN..j.Float.NaN) {
+    for (i in java.lang.Float.NaN..java.lang.Float.NaN) {
         list10.add(i)
         if (list10.size() > 23) break
     }
     if (list10 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN..j.Float.NaN: $list10"
+        return "Wrong elements for java.lang.Float.NaN..java.lang.Float.NaN: $list10"
     }
 
     val list11 = ArrayList<Double>()
-    for (i in j.Double.NaN downTo j.Double.NaN) {
+    for (i in java.lang.Double.NaN downTo java.lang.Double.NaN) {
         list11.add(i)
         if (list11.size() > 23) break
     }
     if (list11 != listOf<Double>()) {
-        return "Wrong elements for j.Double.NaN downTo j.Double.NaN: $list11"
+        return "Wrong elements for java.lang.Double.NaN downTo java.lang.Double.NaN: $list11"
     }
 
     val list12 = ArrayList<Float>()
-    for (i in j.Float.NaN downTo j.Float.NaN) {
+    for (i in java.lang.Float.NaN downTo java.lang.Float.NaN) {
         list12.add(i)
         if (list12.size() > 23) break
     }
     if (list12 != listOf<Float>()) {
-        return "Wrong elements for j.Float.NaN downTo j.Float.NaN: $list12"
+        return "Wrong elements for java.lang.Float.NaN downTo java.lang.Float.NaN: $list12"
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
index 0ce7186c863..db2040ad363 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
index 69fa3176503..6b6debd18ee 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
index 6f05555b03c..ca1e1eaf198 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
index 89b997b8a0d..65d446db81e 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
index d4c93ce04ae..9670a4201b8 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
index 748215bc706..ccae1f689ce 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
index 3fdfdc8c6c0..0b006e73bd6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
index 4590d2edd96..785c4081de8 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
index 9aa13f51f97..f28a59998a6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
index 90e66af0305..f5d5645eac8 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
index 4fe67290634..57f0d25eb19 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
index ac2d8bc9308..b38dd572bd7 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
index 27474270cf9..b5c775dc5ca 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
index 11191c29564..ec8fc03216d 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
index ce99ec7dd9d..cc6682f1806 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
index 95251e86ad4..7af98396411 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
index 77167817a11..8c471b921c0 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
index fb8b2e8d731..326681cdaeb 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
index d70cea1fce2..00728eb8f24 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
@@ -1,6 +1,5 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 import java.util.ArrayList
-import java.lang as j
 
 fun box(): String {
     val list1 = ArrayList<Int>()
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
index 6efd2bd6072..cd3423b7b33 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
@@ -121,7 +121,6 @@ public class GenerateRangesCodegenTestData {
 
         out.println("// Auto-generated by " + GenerateRangesCodegenTestData.class.getName() + ". DO NOT EDIT!");
         out.println("import java.util.ArrayList");
-        out.println("import java.lang as j");
         if (generatedBody.contains("Max") || generatedBody.contains("Min")) {
             // Import min/max values, but only in case when the generated test case actually uses them (not to clutter tests which don't)
             out.println();