Merge pull request #34024 from aschwaighofer/irgen_type_layout_profile_sil_type

IRGen: Scalar type layouts need to profile the SIL type

Author: aschwaighofer

lib/IRGen/TypeLayout.cpp

@@ -596,12 +596,14 @@ void ScalarTypeLayoutEntry::computeProperties() {
 }
 
 void ScalarTypeLayoutEntry::Profile(llvm::FoldingSetNodeID &id) const {
-  ScalarTypeLayoutEntry::Profile(id, typeInfo);
+  ScalarTypeLayoutEntry::Profile(id, typeInfo, representative);
 }
 
 void ScalarTypeLayoutEntry::Profile(llvm::FoldingSetNodeID &id,
-                                    const TypeInfo &ti) {
+                                    const TypeInfo &ti,
+                                    SILType ty) {
   id.AddPointer(&ti);
+  id.AddPointer(ty.getASTType().getPointer());
 }
 
 ScalarTypeLayoutEntry::~ScalarTypeLayoutEntry() {}
@@ -2083,7 +2085,7 @@ TypeLayoutCache::getOrCreateScalarEntry(const TypeInfo &ti,
                                         SILType representative) {
   assert(ti.isFixedSize());
   llvm::FoldingSetNodeID id;
-  ScalarTypeLayoutEntry::Profile(id, ti);
+  ScalarTypeLayoutEntry::Profile(id, ti, representative);
   // Do we already have an entry.
   void *insertPos;
   if (auto *entry = scalarEntries.FindNodeOrInsertPos(id, insertPos)) {

lib/IRGen/TypeLayout.h

@@ -124,6 +124,7 @@ class ScalarTypeLayoutEntry : public TypeLayoutEntry,
 public:
   const TypeInfo &typeInfo;
   SILType representative;
+
   ScalarTypeLayoutEntry(const TypeInfo &ti, SILType representative)
       : TypeLayoutEntry(TypeLayoutEntryKind::Scalar), typeInfo(ti),
         representative(representative) {}
@@ -134,7 +135,8 @@ class ScalarTypeLayoutEntry : public TypeLayoutEntry,
 
   // Support for FoldingSet.
   void Profile(llvm::FoldingSetNodeID &id) const;
-  static void Profile(llvm::FoldingSetNodeID &ID, const TypeInfo &ti);
+  static void Profile(llvm::FoldingSetNodeID &ID, const TypeInfo &ti,
+                      SILType ty);
 
   llvm::Value *alignmentMask(IRGenFunction &IGF) const override;
   llvm::Value *size(IRGenFunction &IGF) const override;

test/IRGen/typelayout_based_value_witness.swift

@@ -87,3 +87,22 @@ public struct A<T> {
 // OPT:   tail call void [[DESTROY]](%swift.opaque* noalias [[ADDR_T4]], %swift.type* [[T]])
 // OPT:   ret void
 // CHECK: }
+
+// Let's not crash on the following example.
+public protocol P {}
+
+public class Ref<T: P> {}
+
+public enum E1<R: P> {
+  case first(R)
+  case second(S<R>)
+}
+
+public struct S<T: P> {
+  public let f: E2<T>? = nil
+}
+
+public enum E2<T: P> {
+    case first(Ref<T>)
+    case second(String)
+}