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

Do not try to detect cycles if delegation call resolution is unsuccessful

Browse Source
This commit is contained in:
Denis Zharkov
2015-03-23 11:06:48 +03:00
parent 9da88bbd0f
commit 023e1a13a9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+1 -1
View File
@@ -229,7 +229,7 @@ public class BodyResolver {
@Nullable @Nullable
private ConstructorDescriptor getDelegatedConstructor(@NotNull ConstructorDescriptor constructor) { private ConstructorDescriptor getDelegatedConstructor(@NotNull ConstructorDescriptor constructor) {
ResolvedCall<ConstructorDescriptor> call = trace.get(CONSTRUCTOR_RESOLVED_DELEGATION_CALL, constructor); ResolvedCall<ConstructorDescriptor> call = trace.get(CONSTRUCTOR_RESOLVED_DELEGATION_CALL, constructor);
return call == null ? null : call.getResultingDescriptor().getOriginal(); return call == null || !call.getStatus().isSuccess() ? null : call.getResultingDescriptor().getOriginal();
} }
public void resolveBodies(@NotNull BodiesResolveContext c) { public void resolveBodies(@NotNull BodiesResolveContext c) {
compiler/testData/diagnostics/tests/secondaryConstructors/generics.kt
+1 -1
View File
@@ -17,5 +17,5 @@ class A1<R> : B<R> {
} }
class A2<R> { class A2<R> {
constructor(t: R, i: Int) : <!CYCLIC_CONSTRUCTOR_DELEGATION_CALL!>this<!>(<!TYPE_MISMATCH!>i<!>, 1) constructor(t: R, i: Int) : this(<!TYPE_MISMATCH!>i<!>, 1)
} }
compiler/testData/diagnostics/tests/secondaryConstructors/kt6994.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER // !DIAGNOSTICS: -UNUSED_PARAMETER
class X<T> { class X<T> {
constructor(t: T, i: Int): <!CYCLIC_CONSTRUCTOR_DELEGATION_CALL!>this<!>(<!TYPE_MISMATCH!>i<!>, 1) constructor(t: T, i: Int): this(<!TYPE_MISMATCH!>i<!>, 1)
} }