Merge #6671

6671: Fix endless go-to-declaration for invalid self-containing structs r=vlad20012 a=vlad20012 Fixes #6605 changelog: Fix endless go-to-declaration for invalid self-containing structs Co-authored-by: vlad20012 <beskvlad@gmail.com>
intellij-rust · Jan 15, 2021 · 4fb1485 · 4fb1485
2 parents b34e272 + 0aa7b7c
commit 4fb1485
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 20 deletions.
diff --git a/src/main/kotlin/org/rust/lang/core/types/ty/Ty.kt b/src/main/kotlin/org/rust/lang/core/types/ty/Ty.kt
@@ -67,28 +67,40 @@ fun Ty.getTypeParameter(name: String): TyTypeParameter? {
 /**
  * See [org.rust.lang.core.type.RsImplicitTraitsTest]
  */
-tailrec fun Ty.isSized(): Boolean {
-    return when (this) {
-        is TyNumeric,
-        is TyBool,
-        is TyChar,
-        is TyUnit,
-        is TyNever,
-        is TyReference,
-        is TyPointer,
-        is TyArray,
-        is TyFunction -> true
-        is TyStr, is TySlice, is TyTraitObject -> false
-        is TyTypeParameter -> isSized
-        is TyAdt -> {
-            val item = item as? RsStructItem ?: return true
-            val typeRef = item.fields.lastOrNull()?.typeReference
-            val type = typeRef?.type?.substitute(typeParameterValues) ?: return true
-            type.isSized()
+fun Ty.isSized(): Boolean {
+    val ancestors = mutableSetOf(this)
+
+    fun Ty.isSizedInner(): Boolean {
+        return when (this) {
+            is TyNumeric,
+            is TyBool,
+            is TyChar,
+            is TyUnit,
+            is TyNever,
+            is TyReference,
+            is TyPointer,
+            is TyArray,
+            is TyFunction -> true
+
+            is TyStr, is TySlice, is TyTraitObject -> false
+
+            is TyTypeParameter -> isSized
+
+            is TyAdt -> {
+                val item = item as? RsStructItem ?: return true
+                val typeRef = item.fields.lastOrNull()?.typeReference
+                val type = typeRef?.type?.substitute(typeParameterValues) ?: return true
+                if (!ancestors.add(type)) return true
+                type.isSizedInner()
+            }
+
+            is TyTuple -> types.last().isSizedInner()
+
+            else -> true
         }
-        is TyTuple -> types.last().isSized()
-        else -> true
     }
+
+    return isSizedInner()
 }
 
 val Ty.isSelf: Boolean

diff --git a/src/test/kotlin/org/rust/lang/core/resolve/RsResolveTest.kt b/src/test/kotlin/org/rust/lang/core/resolve/RsResolveTest.kt
@@ -630,6 +630,18 @@ class RsResolveTest : RsResolveTestBase() {
                                         //^
     """)
 
+    fun `test enum Self in impl block for invalid self-containing struct`() = checkByCodeGeneric<RsImplItem>("""
+        struct E {
+            value: Self
+        }
+        impl E {
+           //X
+            fn new() -> Self {
+                Self
+            } //^
+        }
+    """)
+
     fun `test enum variant 2`() = checkByCode("""
         enum E { X, Y(X) }
                     //^ unresolved

diff --git a/src/test/kotlin/org/rust/lang/core/type/RsImplicitTraitsTest.kt b/src/test/kotlin/org/rust/lang/core/type/RsImplicitTraitsTest.kt
@@ -174,6 +174,23 @@ class RsImplicitTraitsTest : RsTypificationTestBase() {
                //^ !Copy
     """)
 
+    fun `test invalid self-containing struct 1`() = doTest("""
+        struct S {
+            field: Self
+        }
+        type T = S;
+               //^ Sized
+    """)
+
+    fun `test invalid self-containing struct 2`() = doTest("""
+        struct Rc<T>(T);
+        struct S {
+            field: Rc<Self>
+        }
+        type T = S;
+               //^ Sized
+    """)
+
     private fun checkPrimitiveTypes(traitName: String) {
         val allIntegers = TyInteger.VALUES.toTypedArray()
         val allFloats = TyFloat.VALUES.toTypedArray()