Merge pull request #65525 from tbkka/5.9-tbkka-RemoteMirror-MPE-zero-sized-plus-generics

5.9 [RemoteMirror] Fix handling of generic and zero-sized cases in MPEs

Author: tbkka

include/swift/RemoteInspection/TypeRef.h

@@ -216,6 +216,10 @@ class alignas(8) TypeRef {
   const TypeRef *subst(TypeRefBuilder &Builder,
                        const GenericArgumentMap &Subs) const;
 
+  const TypeRef *subst(TypeRefBuilder &Builder,
+                       const GenericArgumentMap &Subs,
+                       bool &DidSubstitute) const;
+
   llvm::Optional<GenericArgumentMap> getSubstMap() const;
 
   virtual ~TypeRef() = default;

include/swift/RemoteInspection/TypeRefBuilder.h

@@ -288,21 +288,18 @@ struct FieldTypeInfo {
   int Value;
   const TypeRef *TR;
   bool Indirect;
+  bool Generic;
 
-  FieldTypeInfo() : Name(""), Value(0), TR(nullptr), Indirect(false) {}
-  FieldTypeInfo(const std::string &Name, int Value, const TypeRef *TR, bool Indirect)
-    : Name(Name), Value(Value), TR(TR), Indirect(Indirect) {}
+  FieldTypeInfo() : Name(""), Value(0), TR(nullptr), Indirect(false), Generic(false) {}
+  FieldTypeInfo(const std::string &Name, int Value, const TypeRef *TR, bool Indirect, bool Generic)
+    : Name(Name), Value(Value), TR(TR), Indirect(Indirect), Generic(Generic) {}
 
   static FieldTypeInfo forEmptyCase(std::string Name, int Value) {
-    return FieldTypeInfo(Name, Value, nullptr, false);
-  }
-
-  static FieldTypeInfo forIndirectCase(std::string Name, int Value, const TypeRef *TR) {
-    return FieldTypeInfo(Name, Value, TR, true);
+    return FieldTypeInfo(Name, Value, nullptr, false, false);
   }
 
   static FieldTypeInfo forField(std::string Name, int Value, const TypeRef *TR) {
-    return FieldTypeInfo(Name, Value, TR, false);
+    return FieldTypeInfo(Name, Value, TR, false, false);
   }
 };