From 0d76634f6b62beeef9097ed286200d488c56413c Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 16 Apr 2015 16:00:16 +0300
Subject: [PATCH] Support SKIP_TXT directive in diagnostic tests

Don't render the whole 'kotlin' package in some tests, because test data will
change every time something is updated in built-ins
---
 .../duplicateClass/collectionMethodStub.kt    |   1 +
 .../duplicateClass/collectionMethodStub.txt   | 555 ------------------
 .../diagnostics/tests/regressions/kt860.kt    |   2 +-
 .../diagnostics/tests/regressions/kt860.txt   | 538 +----------------
 .../checkers/AbstractJetDiagnosticsTest.java  |  11 +
 .../kotlin/checkers/BaseDiagnosticsTest.java  |   2 +-
 6 files changed, 16 insertions(+), 1093 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt

diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt
index db49999ce82..fb8a15bf719 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt
@@ -1,4 +1,5 @@
 // FILE: f1.kt
+// SKIP_TXT
 
 package kotlin
 
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt
deleted file mode 100644
index 9bcfd7c3c1d..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.txt
+++ /dev/null
@@ -1,555 +0,0 @@
-package 
-
-internal final class C : kotlin.MutableIterator<kotlin.Int> {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun hasNext(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ fun next(): kotlin.Int
-    public open override /*1*/ fun remove(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-package kotlin {
-    public fun </*0*/ reified T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
-    public fun kotlin.Any?.identityEquals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public fun kotlin.String?.plus(/*0*/ other: kotlin.Any?): kotlin.String
-    public fun kotlin.Any?.toString(): kotlin.String
-
-    public trait Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public open class Any {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Array</*0*/ reified T> : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Boolean : kotlin.Comparable<kotlin.Boolean> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class BooleanArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class BooleanIterator : kotlin.Iterator<kotlin.Boolean> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Byte : kotlin.Number, kotlin.Comparable<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class ByteIterator : kotlin.Iterator<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteProgression : kotlin.Progression<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class ByteProgressionIterator : kotlin.ByteIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteRange : kotlin.Range<kotlin.Byte>, kotlin.Progression<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Char : kotlin.Comparable<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class CharIterator : kotlin.Iterator<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharProgression : kotlin.Progression<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class CharProgressionIterator : kotlin.CharIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharRange : kotlin.Range<kotlin.Char>, kotlin.Progression<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait CharSequence {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Collection</*0*/ out E> : kotlin.Iterable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Comparable</*0*/ in T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Double : kotlin.Number, kotlin.Comparable<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class DoubleIterator : kotlin.Iterator<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleProgression : kotlin.Progression<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class DoubleProgressionIterator : kotlin.DoubleIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleRange : kotlin.Range<kotlin.Double>, kotlin.Progression<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction0</*0*/ in T, /*1*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction1</*0*/ in T, /*1*/ in P1, /*2*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction10</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction11</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction12</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction13</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction14</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction15</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction16</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction17</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction18</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction19</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction2</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction20</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction21</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction22</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ in P22, /*23*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction3</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction4</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction5</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction6</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction7</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction8</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction9</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Float : kotlin.Number, kotlin.Comparable<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class FloatIterator : kotlin.Iterator<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatProgression : kotlin.Progression<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class FloatProgressionIterator : kotlin.FloatIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatRange : kotlin.Range<kotlin.Float>, kotlin.Progression<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait FloatingPointConstants</*0*/ T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function0</*0*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function1</*0*/ in P1, /*1*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function10</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function11</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function12</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function13</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function14</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function15</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function16</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function17</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function18</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function19</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function2</*0*/ in P1, /*1*/ in P2, /*2*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function20</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function21</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function22</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ in P22, /*22*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function3</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function4</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function5</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function6</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function7</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function8</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function9</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
-        // -- Module: <built-ins module> --
-
-        // Static members
-        // -- Module: <built-ins module> --
-    }
-
-    public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
-        // -- Module: <built-ins module> --
-
-        // Static members
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class IntIterator : kotlin.Iterator<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntProgression : kotlin.Progression<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class IntProgressionIterator : kotlin.IntIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntRange : kotlin.Range<kotlin.Int>, kotlin.Progression<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Iterable</*0*/ out T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Iterator</*0*/ out T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait List</*0*/ out E> : kotlin.Collection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ListIterator</*0*/ out T> : kotlin.Iterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class LongIterator : kotlin.Iterator<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongProgression : kotlin.Progression<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class LongProgressionIterator : kotlin.LongIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongRange : kotlin.Range<kotlin.Long>, kotlin.Progression<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Map</*0*/ K, /*1*/ out V> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableCollection</*0*/ E> : kotlin.Collection<E>, kotlin.MutableIterable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableIterable</*0*/ out T> : kotlin.Iterable<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableIterator</*0*/ out T> : kotlin.Iterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableList</*0*/ E> : kotlin.List<E>, kotlin.MutableCollection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableListIterator</*0*/ T> : kotlin.ListIterator<T>, kotlin.MutableIterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableSet</*0*/ E> : kotlin.Set<E>, kotlin.MutableCollection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Nothing {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class Number {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Progression</*0*/ out N : kotlin.Any> : kotlin.Iterable<N> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait PropertyMetadata {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class PropertyMetadataImpl : kotlin.PropertyMetadata {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Range</*0*/ T : kotlin.Comparable<T>> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Set</*0*/ out E> : kotlin.Collection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Short : kotlin.Number, kotlin.Comparable<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class ShortIterator : kotlin.Iterator<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortProgression : kotlin.Progression<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class ShortProgressionIterator : kotlin.ShortIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortRange : kotlin.Range<kotlin.Short>, kotlin.Progression<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence {
-        // -- Module: <built-ins module> --
-    }
-
-    public open class Throwable {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class Unit {
-        public constructor Unit()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public object Unit {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class data : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class deprecated : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class inline : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class inlineOptions : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class noinline : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class suppress : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class tailRecursive : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.kt b/compiler/testData/diagnostics/tests/regressions/kt860.kt
index 0058d71af04..bcd42bc7ca5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -NOTHING_TO_INLINE
 // KT-860 ConcurrentModificationException in frontend
 
-package kotlin.util
+package std.util
 
 import java.util.*
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.txt b/compiler/testData/diagnostics/tests/regressions/kt860.txt
index 1c55b0d3e57..6ee2b189e1a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.txt
@@ -1,542 +1,8 @@
 package 
 
-package kotlin {
-    public fun </*0*/ reified T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
-    public fun kotlin.Any?.identityEquals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public fun kotlin.String?.plus(/*0*/ other: kotlin.Any?): kotlin.String
-    public fun kotlin.Any?.toString(): kotlin.String
+package std {
 
-    public trait Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public open class Any {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Array</*0*/ reified T> : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Boolean : kotlin.Comparable<kotlin.Boolean> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class BooleanArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class BooleanIterator : kotlin.Iterator<kotlin.Boolean> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Byte : kotlin.Number, kotlin.Comparable<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class ByteIterator : kotlin.Iterator<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteProgression : kotlin.Progression<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class ByteProgressionIterator : kotlin.ByteIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ByteRange : kotlin.Range<kotlin.Byte>, kotlin.Progression<kotlin.Byte> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Char : kotlin.Comparable<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class CharIterator : kotlin.Iterator<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharProgression : kotlin.Progression<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class CharProgressionIterator : kotlin.CharIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class CharRange : kotlin.Range<kotlin.Char>, kotlin.Progression<kotlin.Char> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait CharSequence {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Collection</*0*/ out E> : kotlin.Iterable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Comparable</*0*/ in T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Double : kotlin.Number, kotlin.Comparable<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class DoubleIterator : kotlin.Iterator<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleProgression : kotlin.Progression<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class DoubleProgressionIterator : kotlin.DoubleIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class DoubleRange : kotlin.Range<kotlin.Double>, kotlin.Progression<kotlin.Double> {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction0</*0*/ in T, /*1*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction1</*0*/ in T, /*1*/ in P1, /*2*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction10</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction11</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction12</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction13</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction14</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction15</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction16</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction17</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction18</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction19</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction2</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction20</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction21</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction22</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ in P10, /*11*/ in P11, /*12*/ in P12, /*13*/ in P13, /*14*/ in P14, /*15*/ in P15, /*16*/ in P16, /*17*/ in P17, /*18*/ in P18, /*19*/ in P19, /*20*/ in P20, /*21*/ in P21, /*22*/ in P22, /*23*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction3</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction4</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction5</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction6</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction7</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction8</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ExtensionFunction9</*0*/ in T, /*1*/ in P1, /*2*/ in P2, /*3*/ in P3, /*4*/ in P4, /*5*/ in P5, /*6*/ in P6, /*7*/ in P7, /*8*/ in P8, /*9*/ in P9, /*10*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Float : kotlin.Number, kotlin.Comparable<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class FloatIterator : kotlin.Iterator<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatProgression : kotlin.Progression<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class FloatProgressionIterator : kotlin.FloatIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class FloatRange : kotlin.Range<kotlin.Float>, kotlin.Progression<kotlin.Float> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait FloatingPointConstants</*0*/ T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function0</*0*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function1</*0*/ in P1, /*1*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function10</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function11</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function12</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function13</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function14</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function15</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function16</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function17</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function18</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function19</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function2</*0*/ in P1, /*1*/ in P2, /*2*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function20</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function21</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function22</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ in P10, /*10*/ in P11, /*11*/ in P12, /*12*/ in P13, /*13*/ in P14, /*14*/ in P15, /*15*/ in P16, /*16*/ in P17, /*17*/ in P18, /*18*/ in P19, /*19*/ in P20, /*20*/ in P21, /*21*/ in P22, /*22*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function3</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function4</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function5</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function6</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function7</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function8</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Function9</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/ in P5, /*5*/ in P6, /*6*/ in P7, /*7*/ in P8, /*8*/ in P9, /*9*/ out R> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
-        // -- Module: <built-ins module> --
-
-        // Static members
-        // -- Module: <built-ins module> --
-    }
-
-    public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
-        // -- Module: <built-ins module> --
-
-        // Static members
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class IntIterator : kotlin.Iterator<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntProgression : kotlin.Progression<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class IntProgressionIterator : kotlin.IntIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class IntRange : kotlin.Range<kotlin.Int>, kotlin.Progression<kotlin.Int> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Iterable</*0*/ out T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Iterator</*0*/ out T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait List</*0*/ out E> : kotlin.Collection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait ListIterator</*0*/ out T> : kotlin.Iterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class LongIterator : kotlin.Iterator<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongProgression : kotlin.Progression<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class LongProgressionIterator : kotlin.LongIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class LongRange : kotlin.Range<kotlin.Long>, kotlin.Progression<kotlin.Long> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Map</*0*/ K, /*1*/ out V> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableCollection</*0*/ E> : kotlin.Collection<E>, kotlin.MutableIterable<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableIterable</*0*/ out T> : kotlin.Iterable<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableIterator</*0*/ out T> : kotlin.Iterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableList</*0*/ E> : kotlin.List<E>, kotlin.MutableCollection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableListIterator</*0*/ T> : kotlin.ListIterator<T>, kotlin.MutableIterator<T> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait MutableSet</*0*/ E> : kotlin.Set<E>, kotlin.MutableCollection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Nothing {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class Number {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Progression</*0*/ out N : kotlin.Any> : kotlin.Iterable<N> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait PropertyMetadata {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class PropertyMetadataImpl : kotlin.PropertyMetadata {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Range</*0*/ T : kotlin.Comparable<T>> {
-        // -- Module: <built-ins module> --
-    }
-
-    public trait Set</*0*/ out E> : kotlin.Collection<E> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class Short : kotlin.Number, kotlin.Comparable<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortArray : kotlin.Cloneable {
-        // -- Module: <built-ins module> --
-    }
-
-    public abstract class ShortIterator : kotlin.Iterator<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortProgression : kotlin.Progression<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    internal final class ShortProgressionIterator : kotlin.ShortIterator {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class ShortRange : kotlin.Range<kotlin.Short>, kotlin.Progression<kotlin.Short> {
-        // -- Module: <built-ins module> --
-    }
-
-    public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence {
-        // -- Module: <built-ins module> --
-    }
-
-    public open class Throwable {
-        // -- Module: <built-ins module> --
-    }
-
-    public object Unit {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class data : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class deprecated : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class inline : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class inlineOptions : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class noinline : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class suppress : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    public final annotation class tailRecursive : kotlin.Annotation {
-        // -- Module: <built-ins module> --
-    }
-
-    package kotlin.util {
+    package std.util {
         internal fun </*0*/ T, /*1*/ U : kotlin.MutableCollection<in T>> kotlin.Iterator<T>.to(/*0*/ container: U): U
         internal fun </*0*/ T> kotlin.Iterator<T>.toArrayList(): java.util.ArrayList<T>
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
index 612d339d98f..bc627413cf1 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
@@ -50,6 +50,7 @@ import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
 import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
 import org.jetbrains.kotlin.storage.ExceptionTracker;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.util.DescriptorValidator;
 import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator;
@@ -240,6 +241,16 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
             List<TestFile> testFiles,
             Map<TestModule, ModuleDescriptorImpl> modules
     ) {
+        if (KotlinPackage.any(testFiles, new Function1<TestFile, Boolean>() {
+            @Override
+            public Boolean invoke(TestFile file) {
+                return InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT");
+            }
+        })) {
+            assertFalse(".txt file should not exist if SKIP_TXT directive is used: " + expectedFile, expectedFile.exists());
+            return;
+        }
+
         RecursiveDescriptorComparator comparator = new RecursiveDescriptorComparator(createdAffectedPackagesConfiguration(testFiles));
 
         boolean isMultiModuleTest = modules.size() != 1;
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
index 7eafd61645a..7f4762c9b44 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
@@ -235,7 +235,7 @@ public abstract class BaseDiagnosticsTest extends
 
     protected class TestFile {
         private final List<CheckerTestUtil.DiagnosedRange> diagnosedRanges = Lists.newArrayList();
-        private final String expectedText;
+        public final String expectedText;
         private final TestModule module;
         private final String clearText;
         private final JetFile jetFile;