Merge pull request #81301 from slavapestov/remote-mirrors-cleanups

RemoteInspection: Two small cleanups

Author: slavapestov

include/swift/RemoteInspection/TypeRef.h

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

stdlib/public/RemoteInspection/TypeRef.cpp

@@ -506,6 +506,13 @@ struct TypeRefIsConcrete
   }
 
   bool visitOpaqueArchetypeTypeRef(const OpaqueArchetypeTypeRef *O) {
+    for (auto Args : O->getArgumentLists()) {
+      for (auto *Arg : Args) {
+        if (!visit(Arg))
+          return false;
+      }
+    }
+
     return false;
   }
 
@@ -1350,15 +1357,12 @@ class TypeRefSubstitution
   : public TypeRefVisitor<TypeRefSubstitution, const TypeRef *> {
   TypeRefBuilder &Builder;
   GenericArgumentMap Substitutions;
-  // Set true iff the Substitution map was actually used
-  bool DidSubstitute;
+
 public:
   using TypeRefVisitor<TypeRefSubstitution, const TypeRef *>::visit;
 
   TypeRefSubstitution(TypeRefBuilder &Builder, GenericArgumentMap Substitutions)
-      : Builder(Builder), Substitutions(Substitutions), DidSubstitute(false) {}
-
-  bool didSubstitute() const { return DidSubstitute; }
+      : Builder(Builder), Substitutions(Substitutions) {}
 
   const TypeRef *visitBuiltinTypeRef(const BuiltinTypeRef *B) {
     return B;
@@ -1488,7 +1492,6 @@ class TypeRefSubstitution
     if (found == Substitutions.end())
       return GTP;
     assert(found->second->isConcrete());
-    DidSubstitute = true; // We actually used the Substitutions
 
     // When substituting a concrete type containing a metatype into a
     // type parameter, (eg: T, T := C.Type), we must also represent
@@ -1609,15 +1612,6 @@ const TypeRef *TypeRef::subst(TypeRefBuilder &Builder,
   return TypeRefSubstitution(Builder, Subs).visit(this);
 }
 
-const TypeRef *TypeRef::subst(TypeRefBuilder &Builder,
-                              const GenericArgumentMap &Subs,
-			      bool &DidSubstitute) const {
-  auto subst = TypeRefSubstitution(Builder, Subs);
-  auto TR = subst.visit(this);
-  DidSubstitute = subst.didSubstitute();
-  return TR;
-}
-
 bool TypeRef::deriveSubstitutions(GenericArgumentMap &Subs,
                                   const TypeRef *OrigTR,
                                   const TypeRef *SubstTR) {

stdlib/public/RemoteInspection/TypeRefBuilder.cpp

@@ -538,8 +538,9 @@ bool TypeRefBuilder::getFieldTypeRefs(
     // We need this for enums; an enum case "is generic" if any generic type
     // parameter substitutions occurred on the payload.  E.g.,
     // `case a([T?])` is generic, but `case a([Int?])` is not.
-    bool IsGeneric = false;
-    auto Substituted = Unsubstituted->subst(*this, *Subs, IsGeneric);
+    bool IsGeneric = !Unsubstituted->isConcrete();
+    auto Substituted = (IsGeneric ? Unsubstituted->subst(*this, *Subs)
+                                  : Unsubstituted);
     bool IsIndirect = FD.isEnum() && Field->IsIndirectCase;
 
     auto FieldTI = FieldTypeInfo(FieldName.str(), FieldValue, Substituted,