From 30fd22499b5230a164a11ec04af10a0d99100522 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 9 Aug 2016 10:32:15 +0300 Subject: [PATCH] Test data fix (after cherry-pick from 1.0.4) --- .../tests/controlFlowAnalysis/enumInterdependence.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt index 68b14a48ec8..0526eb5bfbe 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt @@ -144,6 +144,8 @@ public final enum class Fruit : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Fruit): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -172,6 +174,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String