Merge remote-tracking branch 'origin/master' into incremental

compiler/testData/builtin-classes.txt

@@ -141,6 +141,7 @@ public final class ByteProgression : kotlin.Progression<kotlin.Byte> {
         public open override /*1*/ fun <get-increment>(): kotlin.Int
     public open override /*1*/ val start: kotlin.Byte
         public open override /*1*/ fun <get-start>(): kotlin.Byte
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ByteIterator
 }
 
@@ -170,6 +171,7 @@ public final class ByteRange : kotlin.Range<kotlin.Byte>, kotlin.Progression<kot
     public open override /*2*/ val start: kotlin.Byte
         public open override /*2*/ fun <get-start>(): kotlin.Byte
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Byte): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ByteIterator
     
     public class object <class-object-for-ByteRange> {
@@ -259,6 +261,7 @@ public final class CharProgression : kotlin.Progression<kotlin.Char> {
         public open override /*1*/ fun <get-increment>(): kotlin.Int
     public open override /*1*/ val start: kotlin.Char
         public open override /*1*/ fun <get-start>(): kotlin.Char
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.CharIterator
 }
 
@@ -288,6 +291,7 @@ public final class CharRange : kotlin.Range<kotlin.Char>, kotlin.Progression<kot
     public open override /*2*/ val start: kotlin.Char
         public open override /*2*/ fun <get-start>(): kotlin.Char
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Char): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.CharIterator
     
     public class object <class-object-for-CharRange> {
@@ -404,6 +408,7 @@ public final class DoubleProgression : kotlin.Progression<kotlin.Double> {
         public open override /*1*/ fun <get-increment>(): kotlin.Double
     public open override /*1*/ val start: kotlin.Double
         public open override /*1*/ fun <get-start>(): kotlin.Double
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.DoubleIterator
 }
 
@@ -430,6 +435,7 @@ public final class DoubleRange : kotlin.Range<kotlin.Double>, kotlin.Progression
     public open override /*2*/ val start: kotlin.Double
         public open override /*2*/ fun <get-start>(): kotlin.Double
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Double): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.DoubleIterator
     
     public class object <class-object-for-DoubleRange> {
@@ -627,6 +633,7 @@ public final class FloatProgression : kotlin.Progression<kotlin.Float> {
         public open override /*1*/ fun <get-increment>(): kotlin.Float
     public open override /*1*/ val start: kotlin.Float
         public open override /*1*/ fun <get-start>(): kotlin.Float
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.FloatIterator
 }
 
@@ -653,6 +660,7 @@ public final class FloatRange : kotlin.Range<kotlin.Float>, kotlin.Progression<k
     public open override /*2*/ val start: kotlin.Float
         public open override /*2*/ fun <get-start>(): kotlin.Float
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Float): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.FloatIterator
     
     public class object <class-object-for-FloatRange> {
@@ -887,6 +895,7 @@ public final class IntProgression : kotlin.Progression<kotlin.Int> {
         public open override /*1*/ fun <get-increment>(): kotlin.Int
     public open override /*1*/ val start: kotlin.Int
         public open override /*1*/ fun <get-start>(): kotlin.Int
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.IntIterator
 }
 
@@ -916,6 +925,7 @@ public final class IntRange : kotlin.Range<kotlin.Int>, kotlin.Progression<kotli
     public open override /*2*/ val start: kotlin.Int
         public open override /*2*/ fun <get-start>(): kotlin.Int
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Int): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.IntIterator
     
     public class object <class-object-for-IntRange> {
@@ -1054,6 +1064,7 @@ public final class LongProgression : kotlin.Progression<kotlin.Long> {
         public open override /*1*/ fun <get-increment>(): kotlin.Long
     public open override /*1*/ val start: kotlin.Long
         public open override /*1*/ fun <get-start>(): kotlin.Long
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.LongIterator
 }
 
@@ -1083,6 +1094,7 @@ public final class LongRange : kotlin.Range<kotlin.Long>, kotlin.Progression<kot
     public open override /*2*/ val start: kotlin.Long
         public open override /*2*/ fun <get-start>(): kotlin.Long
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Long): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.LongIterator
     
     public class object <class-object-for-LongRange> {
@@ -1245,6 +1257,7 @@ public trait Range</*0*/ T : kotlin.Comparable<T>> {
     public abstract val start: T
         public abstract fun <get-start>(): T
     public abstract fun contains(/*0*/ item: T): kotlin.Boolean
+    public open fun isEmpty(): kotlin.Boolean
 }
 
 public trait Set</*0*/ out E> : kotlin.Collection<E> {
@@ -1345,6 +1358,7 @@ public final class ShortProgression : kotlin.Progression<kotlin.Short> {
         public open override /*1*/ fun <get-increment>(): kotlin.Int
     public open override /*1*/ val start: kotlin.Short
         public open override /*1*/ fun <get-start>(): kotlin.Short
+    public final fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ShortIterator
 }
 
@@ -1374,6 +1388,7 @@ public final class ShortRange : kotlin.Range<kotlin.Short>, kotlin.Progression<k
     public open override /*2*/ val start: kotlin.Short
         public open override /*2*/ fun <get-start>(): kotlin.Short
     public open override /*1*/ fun contains(/*0*/ item: kotlin.Short): kotlin.Boolean
+    public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ShortIterator
     
     public class object <class-object-for-ShortRange> {

compiler/testData/codegen/boxWithStdlib/annotations/jvmFlags.kt

@@ -0,0 +1,21 @@
+import java.lang.reflect.Modifier
+
+class C {
+    volatile var vol = 1
+    transient val tra = 1
+
+    strictfp fun str() {}
+    synchronized fun sync() {}
+}
+
+fun box(): String {
+    val c = javaClass<C>()
+
+    if (c.getDeclaredField("vol").getModifiers() and Modifier.VOLATILE == 0) return "Fail: volatile"
+    if (c.getDeclaredField("tra").getModifiers() and Modifier.TRANSIENT == 0) return "Fail: transient"
+
+    if (c.getDeclaredMethod("str").getModifiers() and Modifier.STRICT == 0) return "Fail: strict"
+    if (c.getDeclaredMethod("sync").getModifiers() and Modifier.SYNCHRONIZED == 0) return "Fail: synchronized"
+
+    return "OK"
+}

compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt

@@ -0,0 +1,10 @@
+volatile var vol = 1
+transient val tra = 1
+
+strictfp fun str() {}
+synchronized fun sync() {}
+
+// 0 kotlin/jvm/volatile
+// 0 kotlin/jvm/transient
+// 0 kotlin/jvm/strictfp
+// 0 kotlin/jvm/synchronized

compiler/testData/codegen/bytecodeText/noVolatileAnnotation.kt

@@ -1,3 +0,0 @@
-volatile val foo: Int = 1
-
-// 0 kotlin/volatile

compiler/testData/loadJava/compiledJava/PrivateMembers.java

@@ -0,0 +1,30 @@
+package test;
+
+public class PrivateMembers {
+    private PrivateMembers() {
+    }
+
+    private int field = 1;
+    private static int staticField = 2;
+
+    private void method() {
+    }
+
+    private void samAdapter(SamInterface r) {
+    }
+
+    private static void staticMethod() {
+    }
+
+    private class Inner {
+    }
+
+    private interface SamInterface {
+        void foo();
+    }
+
+    private static class Nested {
+        private static void staticMethodInNested() {
+        }
+    }
+}

compiler/testData/loadJava/compiledJava/PrivateMembers.txt

@@ -0,0 +1,31 @@
+package test
+
+public open class PrivateMembers : java.lang.Object {
+    private constructor PrivateMembers()
+    private final var field: kotlin.Int
+    private open fun method(): kotlin.Unit
+    private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
+    private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
+
+    private open inner class Inner : java.lang.Object {
+        private constructor Inner()
+    }
+
+    private open class Nested : java.lang.Object {
+        private constructor Nested()
+    }
+
+    private trait SamInterface : java.lang.Object {
+        public abstract fun foo(): kotlin.Unit
+    }
+}
+
+package test.PrivateMembers {
+    private var staticField: kotlin.Int
+    private /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.PrivateMembers.SamInterface
+    private open fun staticMethod(): kotlin.Unit
+
+    package test.PrivateMembers.Nested {
+        private open fun staticMethodInNested(): kotlin.Unit
+    }
+}

compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java

@@ -0,0 +1,19 @@
+package test;
+
+public class PrivateMembersInHierarchy {
+    public static class Super {
+        private int field = 1;
+        private int field2 = 1;
+
+        private void method() {
+        }
+    }
+
+    public static class Sub extends Super {
+        private int field = 1;
+
+        private void method() {
+        }
+    }
+}
+

compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt

@@ -0,0 +1,19 @@
+package test
+
+public open class PrivateMembersInHierarchy : java.lang.Object {
+    public constructor PrivateMembersInHierarchy()
+
+    public open class Sub : test.PrivateMembersInHierarchy.Super {
+        public constructor Sub()
+        private final var field: kotlin.Int
+        invisible_fake final override /*1*/ /*fake_override*/ var field2: kotlin.Int
+        private open fun method(): kotlin.Unit
+    }
+
+    public open class Super : java.lang.Object {
+        public constructor Super()
+        private final var field: kotlin.Int
+        private final var field2: kotlin.Int
+        private open fun method(): kotlin.Unit
+    }
+}

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt

@@ -2,9 +2,12 @@ package test
 
 public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     public constructor ClassDoesNotOverrideMethod()
+    invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.Date?
+    invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long
     public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date): kotlin.Int
+    invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date?
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
@@ -12,8 +15,12 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun getTime(): kotlin.Long
+    invisible_fake final override /*1*/ /*fake_override*/ fun getTimeImpl(): kotlin.Long
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
+    invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date?
+    invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date?): sun.util.calendar.BaseCalendar.Date?
+    invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream?): kotlin.Unit
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -23,4 +30,5 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String
+    invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream?): kotlin.Unit
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt

@@ -17,6 +17,8 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String?
+    invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean

compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt

@@ -0,0 +1,14 @@
+//ALLOW_AST_ACCESS
+
+package test
+
+public class PrivateClassMembers {
+    private val v = 0
+
+    private var r = 0
+        private set
+
+    private fun f() = 0
+
+    internal val internal = 0
+}

compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.txt

@@ -0,0 +1,13 @@
+package test
+
+public final class PrivateClassMembers {
+    /*primary*/ public constructor PrivateClassMembers()
+    internal final val internal: kotlin.Int = 0
+        internal final fun <get-internal>(): kotlin.Int
+    private final var r: kotlin.Int
+        private final fun <get-r>(): kotlin.Int
+        private final fun <set-r>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
+    private final val v: kotlin.Int = 0
+        private final fun <get-v>(): kotlin.Int
+    private final fun f(): kotlin.Int
+}

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt

@@ -0,0 +1,4 @@
+package test
+
+public class InheritJavaField(): Super() {
+}

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.txt

@@ -0,0 +1,15 @@
+package test
+
+public final class InheritJavaField : test.Super {
+    public constructor InheritJavaField()
+    public final override /*1*/ /*fake_override*/ var field: kotlin.Int
+    invisible_fake final override /*1*/ /*fake_override*/ var privateField: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun method(): kotlin.Int
+}
+
+public open class Super : java.lang.Object {
+    public constructor Super()
+    public final var field: kotlin.Int
+    private final var privateField: kotlin.Int
+    public open fun method(): kotlin.Int
+}

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField/Super.java

@@ -0,0 +1,7 @@
+package test;
+
+public class Super {
+    public int field = 55;
+    private int privateField = 54;
+    public int method() { return 1; }
+}

compiler/testData/psi/BackslashInString.kt

@@ -0,0 +1,3 @@
+fun foo() {
+    "\
+}

compiler/testData/psi/BackslashInString.txt

@@ -0,0 +1,22 @@
+JetFile: BackslashInString.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      STRING_TEMPLATE
+        PsiElement(OPEN_QUOTE)('"')
+        PsiErrorElement:Unexpected token in a string template
+          PsiElement(BAD_CHARACTER)('\')
+        PsiErrorElement:Expecting '"'
+          <empty list>
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')