azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong containingDeclaration for property type parameter.

Browse Source
This commit is contained in:
Stanislav Erokhin
2014-08-21 15:08:01 +04:00
parent b69ed539ea
commit c10c1ad7f6
6 changed files with 375 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+1 -1
View File
@@ -952,7 +952,7 @@ public class DescriptorResolver {
WritableScope writableScope = new WritableScopeImpl(
scope, containingDeclaration, new TraceBasedRedeclarationHandler(trace),
"Scope with type parameters of a property");
typeParameterDescriptors = resolveTypeParametersForCallableDescriptor(containingDeclaration, writableScope, typeParameters,
typeParameterDescriptors = resolveTypeParametersForCallableDescriptor(propertyDescriptor, writableScope, typeParameters,
trace);
writableScope.changeLockLevel(WritableScope.LockLevel.READING);
resolveGenericBounds(property, propertyDescriptor, writableScope, typeParameterDescriptors, trace);
compiler/testData/diagnostics/tests/MultipleBounds.kt
+6
View File
@@ -8,6 +8,12 @@ trait B {
fun bar() : Double = 1.0;
}
trait G<X> {
val <X : A> boo: Double where X : B
val <A> bal: Double where A : B
val <Y : B> bas: Double where <!NAME_IN_CONSTRAINT_IS_NOT_A_TYPE_PARAMETER!>X<!> : B
}
class C() : A(), B
class D() {
compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
+350 -349
View File
@@ -23,428 +23,429 @@ LazyJavaPackageFragmentProvider@5 {
packageFragments('Jet87.D': FqName@21) = null
packageFragments('Jet87.Double': FqName@22) = null
packageFragments('Jet87.Foo': FqName@23) = null
packageFragments('Jet87.Int': FqName@24) = null
packageFragments('Jet87.T': FqName@25) = null
packageFragments('Jet87.Test': FqName@26) = null
packageFragments('Jet87.Test1': FqName@27) = null
packageFragments('Jet87.X': FqName@28) = null
packageFragments('Jet87.Y': FqName@29) = null
packageFragments('Jet87.nioho': FqName@30) = null
packageFragments('Jet87.t1': FqName@31) = null
packageFragments('Jet87.t2': FqName@32) = null
packageFragments('Jet87.t3': FqName@33) = null
packageFragments('Jet87.x': FqName@34) = null
packageFragments('T': FqName@35) = null
packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
packageFragments('java.lang.A': FqName@40) = null
packageFragments('java.lang.B': FqName@41) = null
packageFragments('java.lang.Bar': FqName@42) = null
packageFragments('java.lang.C': FqName@43) = null
packageFragments('java.lang.Double': FqName@44) = null
packageFragments('java.lang.Foo': FqName@45) = null
packageFragments('java.lang.Int': FqName@46) = null
packageFragments('java.lang.T': FqName@47) = null
packageFragments('java.lang.nioho': FqName@48) = null
packageFragments('kotlin': FqName@49) = null
packageFragments('kotlin.A': FqName@50) = null
packageFragments('kotlin.B': FqName@51) = null
packageFragments('kotlin.Bar': FqName@52) = null
packageFragments('kotlin.C': FqName@53) = null
packageFragments('kotlin.Double': FqName@54) = null
packageFragments('kotlin.Foo': FqName@55) = null
packageFragments('kotlin.Int': FqName@56) = null
packageFragments('kotlin.T': FqName@57) = null
packageFragments('kotlin.io': FqName@58) = null
packageFragments('kotlin.jvm': FqName@59) = null
packageFragments('kotlin.nioho': FqName@60) = null
packageFragments('nioho': FqName@61) = null
packageFragments('Jet87.G': FqName@24) = null
packageFragments('Jet87.Int': FqName@25) = null
packageFragments('Jet87.T': FqName@26) = null
packageFragments('Jet87.Test': FqName@27) = null
packageFragments('Jet87.Test1': FqName@28) = null
packageFragments('Jet87.X': FqName@29) = null
packageFragments('Jet87.Y': FqName@30) = null
packageFragments('Jet87.nioho': FqName@31) = null
packageFragments('Jet87.t1': FqName@32) = null
packageFragments('Jet87.t2': FqName@33) = null
packageFragments('Jet87.t3': FqName@34) = null
packageFragments('Jet87.x': FqName@35) = null
packageFragments('T': FqName@36) = null
packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
packageFragments('java.lang.A': FqName@41) = null
packageFragments('java.lang.B': FqName@42) = null
packageFragments('java.lang.Bar': FqName@43) = null
packageFragments('java.lang.C': FqName@44) = null
packageFragments('java.lang.Double': FqName@45) = null
packageFragments('java.lang.Foo': FqName@46) = null
packageFragments('java.lang.Int': FqName@47) = null
packageFragments('java.lang.T': FqName@48) = null
packageFragments('java.lang.nioho': FqName@49) = null
packageFragments('kotlin': FqName@50) = null
packageFragments('kotlin.A': FqName@51) = null
packageFragments('kotlin.B': FqName@52) = null
packageFragments('kotlin.Bar': FqName@53) = null
packageFragments('kotlin.C': FqName@54) = null
packageFragments('kotlin.Double': FqName@55) = null
packageFragments('kotlin.Foo': FqName@56) = null
packageFragments('kotlin.Int': FqName@57) = null
packageFragments('kotlin.T': FqName@58) = null
packageFragments('kotlin.io': FqName@59) = null
packageFragments('kotlin.jvm': FqName@60) = null
packageFragments('kotlin.nioho': FqName@61) = null
packageFragments('nioho': FqName@62) = null
}
LazyJavaPackageFragment@37['java'] {
classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@63
functions('lang': Name@65) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@63
memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@63
LazyJavaPackageFragment@38['java'] {
classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@64
functions('lang': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@64
}
LazyJavaPackageFragment@39['lang'] {
classes('A': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
classes('Test1': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
classes('nioho': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
classes('test2': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@69
functions('A': Name@68) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
functions('C': Name@70) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
functions('Test1': Name@71) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
functions('test2': Name@73) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@69
LazyJavaPackageFragment@40['lang'] {
classes('A': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
classes('C': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
classes('Test1': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
classes('nioho': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
classes('test2': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@70
functions('A': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
functions('C': Name@71) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
functions('Test1': Name@72) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
functions('test2': Name@74) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@70
}
ResolutionTaskHolder@75 {
<name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
<name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@76 {
<name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
<name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@79 {
<name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
<name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@80 {
<name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
<name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@83 {
<name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
<name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@84 {
<name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
<name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@87 {
<name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
<name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@88 {
<name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
<name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@91 {
<name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
<name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@92 {
<name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
<name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@95 {
<name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
<name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@96 {
<name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
<name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@99 {
<name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
<name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@100 {
<name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
<name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@103 {
<name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
<name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@104 {
<name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
<name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@107 {
<name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
<name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@108 {
<name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
<name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@111 {
<name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
<name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
ResolutionTaskHolder@112 {
<name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
<name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
}
ResolutionTaskHolder@115 {
<name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
<name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
ResolutionTaskHolder@116 {
<name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
<name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
}
ResolutionTaskHolder@119 {
<name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
<name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
ResolutionTaskHolder@120 {
<name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
<name not found> = ArrayList@123[1] { ResolutionCandidate@122 }
}
ResolutionTaskHolder@123 {
<name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
<name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
ResolutionTaskHolder@124 {
<name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
<name not found> = ArrayList@127[1] { ResolutionCandidate@126 }
}
ResolutionTaskHolder@127 {
<name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
<name not found> = ArrayList@130[1] { ResolutionCandidate@129 }
ResolutionTaskHolder@128 {
<name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
<name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
}
ResolutionTaskHolder@131 {
<name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
<name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
ResolutionTaskHolder@132 {
<name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
<name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
}
ResolutionTaskHolder@135 {
<name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
<name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
ResolutionTaskHolder@136 {
<name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
<name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
}
ResolutionTaskHolder@139 {
<name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
<name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
ResolutionTaskHolder@140 {
<name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
<name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
}
ResolutionTaskHolder@143 {
<name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
<name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
ResolutionTaskHolder@144 {
<name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
<name not found> = ArrayList@147[1] { ResolutionCandidate@146 }
}
ResolutionTaskHolder@147 {
<name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
<name not found> = ArrayList@150[1] { ResolutionCandidate@149 }
}
ResolutionTaskHolder@151 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
ResolutionTaskHolder@148 {
<name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
<name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
}
ResolutionTaskHolder@152 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@153 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@154 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@155 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@156 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@157 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@158 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@159 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@160 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@161 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@162 {
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@66[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
ResolutionTaskHolder@163 {
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
<name not found> = EmptyList@67[empty]
}
compiler/testData/diagnostics/tests/MultipleBounds.txt
+9
View File
@@ -69,6 +69,15 @@ package Jet87 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait G</*0*/ X> {
internal abstract val </*0*/ A : Jet87.B> bal: kotlin.Double
internal abstract val </*0*/ Y : Jet87.B> bas: kotlin.Double
internal abstract val </*0*/ X : Jet87.A> boo: kotlin.Double where X : Jet87.B
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
}
internal final class Test</*0*/ T> {
public constructor Test</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/renderer/Classes.kt
+8
View File
@@ -9,6 +9,9 @@ public open class TheClass<out T : Int, X> [AnotherAnnotation] () {
val shouldBeFinal: Int = 5
val <T> T.checkTypeParameterScope: Int get() = 6
val <T> checkTypeParameterScope2 = 6
protected abstract fun foo() {}
private class Inner {}
@@ -40,6 +43,11 @@ public trait TwoUpperBounds<T> where T : Number, T : Any
//<X> defined in rendererTest.TheClass
//private final val privateVal: kotlin.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal: kotlin.Int defined in rendererTest.TheClass
//internal final val <T> T.checkTypeParameterScope: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope
//internal final fun T.<get-checkTypeParameterScope>(): kotlin.Int defined in rendererTest.TheClass
//internal final val <T> checkTypeParameterScope2: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope2
//protected abstract fun foo(): kotlin.Unit defined in rendererTest.TheClass
//private final class Inner defined in rendererTest.TheClass
//public constructor Inner() defined in rendererTest.TheClass.Inner
compiler/testData/renderer/GlobalProperties.kt
+1 -1
View File
@@ -25,5 +25,5 @@ get() {}
//public fun kotlin.Int.<get-ext>(): kotlin.Int defined in rendererTest
//kotlin.deprecated internal val deprecatedVal: kotlin.Int defined in rendererTest
//public val <T : kotlin.CharSequence> T.extWithTwoUpperBounds: kotlin.Int where T : kotlin.Number defined in rendererTest
//<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest
//<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest.extWithTwoUpperBounds
//public fun T.<get-extWithTwoUpperBounds>(): kotlin.Int defined in rendererTest