[SwiftStaticMirror] Create API to query an opaque associated type's same-type requirements

Author: artemcm

include/swift-c/StaticMirror/BinaryScan.h

@@ -25,7 +25,7 @@
 /// SWIFTSTATICMIRROR_VERSION_MINOR should increase when there are API additions.
 /// SWIFTSTATICMIRROR_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
 #define SWIFTSTATICMIRROR_VERSION_MAJOR 0
-#define SWIFTSTATICMIRROR_VERSION_MINOR 4 // Added opaque associated type's protocol requirements
+#define SWIFTSTATICMIRROR_VERSION_MINOR 5 // Added opaque associated type's same-type requirements
 
 SWIFTSTATICMIRROR_BEGIN_DECLS
 
@@ -116,7 +116,10 @@ SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_type_alias_get_substituted_type_mangled_name(
         swift_static_mirror_type_alias_t);
 SWIFTSTATICMIRROR_PUBLIC swiftscan_string_set_t *
-swift_static_mirror_type_alias_get_opaque_type_requirements(
+swift_static_mirror_type_alias_get_opaque_type_protocol_requirements(
+        swift_static_mirror_type_alias_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_type_alias_set_t *
+swift_static_mirror_type_alias_get_opaque_type_same_type_requirements(
         swift_static_mirror_type_alias_t);
 
 // swift_static_mirror_associated_type_info query methods

include/swift/StaticMirror/BinaryScanImpl.h

@@ -34,7 +34,8 @@ struct swift_static_mirror_type_alias_s {
   swift_static_mirror_string_ref_t type_alias_name;
   swift_static_mirror_string_ref_t substituted_type_name;
   swift_static_mirror_string_ref_t substituted_type_mangled_name;
-  swift_static_mirror_string_set_t *opaque_requirements_set;
+  swift_static_mirror_string_set_t *opaque_protocol_requirements_set;
+  swift_static_mirror_type_alias_set_t *opaque_same_type_requirements_set;
 };
 
 struct swift_static_mirror_associated_type_info_s {

tools/libStaticMirror/libStaticMirror.cpp

@@ -183,11 +183,41 @@ convertAssociatedTypeQueryResult(
       typeAliasDetails->substituted_type_mangled_name =
           swift::c_string_utils::create_clone(
               typeAliasInfo.SubstitutionInfo.SubstitutedTypeMangledName.c_str());
-      info->type_alias_set->type_aliases[typealiasIndex] = typeAliasDetails;
-      typealiasIndex += 1;
-      typeAliasDetails->opaque_requirements_set =
+
+      // Opaque type's protocol conformance requirements
+      typeAliasDetails->opaque_protocol_requirements_set =
           swift::c_string_utils::create_set(
               typeAliasInfo.OpaqueTypeProtocolConformanceRequirements);
+
+      // Opaque type's same-type requirements
+      typeAliasDetails->opaque_same_type_requirements_set =
+          new swift_static_mirror_type_alias_set_t;
+      typeAliasDetails->opaque_same_type_requirements_set->count =
+          typeAliasInfo.OpaqueTypeSameTypeRequirements.size();
+      typeAliasDetails->opaque_same_type_requirements_set->type_aliases =
+          new swift_static_mirror_type_alias_t
+              [typeAliasInfo.OpaqueTypeSameTypeRequirements.size()];
+      int sameTypeReqIndex = 0;
+      for (const auto &sameTypeReq :
+           typeAliasInfo.OpaqueTypeSameTypeRequirements) {
+        swift_static_mirror_type_alias_s *sameTypeReqDetails =
+            new swift_static_mirror_type_alias_s;
+        sameTypeReqDetails->type_alias_name =
+            swift::c_string_utils::create_clone(
+                sameTypeReq.TypeAliasName.c_str());
+        sameTypeReqDetails->substituted_type_mangled_name =
+            swift::c_string_utils::create_clone(
+                sameTypeReq.SubstitutedTypeMangledName.c_str());
+        sameTypeReqDetails->substituted_type_name =
+            swift::c_string_utils::create_clone(
+                sameTypeReq.SubstitutedTypeFullyQualifiedName.c_str());
+        typeAliasDetails->opaque_same_type_requirements_set
+            ->type_aliases[sameTypeReqIndex] = sameTypeReqDetails;
+        sameTypeReqIndex += 1;
+      }
+
+      info->type_alias_set->type_aliases[typealiasIndex] = typeAliasDetails;
+      typealiasIndex += 1;
     }
     result->associated_type_infos[associatedTypeInfoIndex] = info;
     associatedTypeInfoIndex += 1;
@@ -282,9 +312,14 @@ swift_static_mirror_type_alias_get_substituted_type_mangled_name(
   return type_alias->substituted_type_mangled_name;
 }
 swiftscan_string_set_t *
-swift_static_mirror_type_alias_get_opaque_type_requirements(
+swift_static_mirror_type_alias_get_opaque_type_protocol_requirements(
+    swift_static_mirror_type_alias_t type_alias) {
+  return type_alias->opaque_protocol_requirements_set;
+}
+swift_static_mirror_type_alias_set_t *
+swift_static_mirror_type_alias_get_opaque_type_same_type_requirements(
     swift_static_mirror_type_alias_t type_alias) {
-  return type_alias->opaque_requirements_set;
+  return type_alias->opaque_same_type_requirements_set;
 }
 
 // swift_static_mirror_associated_type_info query methods

tools/libStaticMirror/libStaticMirror.exports

@@ -7,7 +7,8 @@ swift_static_mirror_conformance_info_get_mangled_type_name
 swift_static_mirror_type_alias_get_type_alias_name
 swift_static_mirror_type_alias_get_substituted_type_name
 swift_static_mirror_type_alias_get_substituted_type_mangled_name
-swift_static_mirror_type_alias_get_opaque_type_requirements
+swift_static_mirror_type_alias_get_opaque_type_protocol_requirements
+swift_static_mirror_type_alias_get_opaque_type_same_type_requirements
 swift_static_mirror_associated_type_info_get_mangled_type_name
 swift_static_mirror_associated_type_info_get_type_alias_set
 swift_static_mirror_associated_type_info_set_create