From c2452c052e66ef97d55a414b716bb7269d466aa8 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 12 Mar 2024 13:42:23 -0700
Subject: [PATCH] Add more test cases for shared generics

---
 src/tests/JIT/Intrinsics/TypeIntrinsics.cs | 37 +++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/tests/JIT/Intrinsics/TypeIntrinsics.cs b/src/tests/JIT/Intrinsics/TypeIntrinsics.cs
index 7f05c07a58eed6..0c9f985283d59b 100644
--- a/src/tests/JIT/Intrinsics/TypeIntrinsics.cs
+++ b/src/tests/JIT/Intrinsics/TypeIntrinsics.cs
@@ -229,12 +229,15 @@ private static void IsGenericTypeTests()
         IsFalse(typeof(int*).IsGenericType);
         IsFalse(typeof(void*).IsGenericType);
         IsFalse(typeof(delegate*<int>).IsGenericType);
-        IsFalse(new ClassUsingIsGenericTypeOnT<char>().IsGenericType()));
-        IsFalse(new ClassUsingIsGenericTypeOnT<string>().IsGenericType()));
-        IsFalse(new ClassUsingIsGenericTypeOnT<object>().IsGenericType()));
-        IsFalse(new ClassUsingIsGenericTypeOnT<int[]>().IsGenericType()));
-        IsFalse(new ClassUsingIsGenericTypeOnT<RuntimeArgumentHandle>().IsGenericType()));
-        IsFalse(new ClassUsingIsGenericTypeOnT<Action>().IsGenericType()));
+        IsFalse(new ClassUsingIsGenericTypeOnT<char>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<string>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<object>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<int[]>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<RuntimeArgumentHandle>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<char>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<string>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<object>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<int[]>().IsGenericTypeFromArray());
 
         IsTrue(typeof(GenericSimpleClass<int>).IsGenericType);
         IsTrue(typeof(GenericSimpleClass<>).IsGenericType);
@@ -258,11 +261,19 @@ private static void IsGenericTypeTests()
         IsTrue(typeof(Action<string>).IsGenericType);
         IsTrue(typeof(Func<string, int>).IsGenericType);
         IsTrue(typeof(Func<,>).IsGenericType);
-        IsTrue(new ClassUsingIsGenericTypeOnT<List<string>>().IsGenericType()));
-        IsTrue(new ClassUsingIsGenericTypeOnT<List<object>>().IsGenericType()));
-        IsTrue(new ClassUsingIsGenericTypeOnT<GenericSimpleClass<int>>().IsGenericType()));
-        IsTrue(new ClassUsingIsGenericTypeOnT<int?>().IsGenericType()));
-        IsTrue(new ClassUsingIsGenericTypeOnT<Action<string>>().IsGenericType()));
+        IsTrue(new ClassUsingIsGenericTypeOnT<List<string>>().IsGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<List<object>>().IsGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<GenericSimpleClass<int>>().IsGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<int?>().IsGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<Action<string>>().IsGenericType());
+        IsFalse(new ClassUsingIsGenericTypeOnT<GenericSimpleClass<int>>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<IGenericInterface<string>>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<List<object>>().IsGenericTypeFromArray());
+        IsFalse(new ClassUsingIsGenericTypeOnT<Action<string>>().IsGenericTypeFromArray());
+        IsTrue(new ClassUsingIsGenericTypeOnT<char>().IsGenericTypeFromOtherGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<string>().IsGenericTypeFromOtherGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<object>().IsGenericTypeFromOtherGenericType());
+        IsTrue(new ClassUsingIsGenericTypeOnT<int[]>().IsGenericTypeFromOtherGenericType());
     }
 
     private static int _varInt = 42;
@@ -340,6 +351,10 @@ static void ThrowsNRE(Action action, [CallerLineNumber] int line = 0, [CallerFil
 public class ClassUsingIsGenericTypeOnT<T>
 {
     public bool IsGenericType() => typeof(T).IsGenericType;
+
+    public bool IsGenericTypeFromArray() => typeof(T[]).IsGenericType;
+
+    public bool IsGenericTypeFromOtherGenericType() => typeof(GenericSimpleClass<T>).IsGenericType;
 }
 
 public class GenericSimpleClass<T>