Merge pull request #72519 from mikeash/fix-validate-prespecialized-metadata

[Runtime] Fix _swift_validatePrespecializedMetadata when type lookup fails.

Author: mikeash

include/swift/Runtime/LibPrespecialized.h

@@ -62,7 +62,6 @@ void libPrespecializedImageLoaded();
 // were validated (which is the total number in the table), and outFailed is set
 // to the number that failed validation.
 SWIFT_RUNTIME_EXPORT
-void _swift_validatePrespecializedMetadata(unsigned *outValidated,
-                                           unsigned *outFailed);
+void _swift_validatePrespecializedMetadata();
 
 #endif // SWIFT_LIB_PRESPECIALIZED_H

stdlib/public/runtime/LibPrespecialized.cpp

@@ -245,20 +245,17 @@ swift::getLibPrespecializedMetadata(const TypeContextDescriptor *description,
   return result;
 }
 
-void _swift_validatePrespecializedMetadata(unsigned *outValidated,
-                                           unsigned *outFailed) {
-  if (outValidated)
-    *outValidated = 0;
-  if (outFailed)
-    *outFailed = 0;
-
+void _swift_validatePrespecializedMetadata() {
   auto *data = getLibPrespecializedData();
   if (!data) {
     return;
   }
 
   disableForValidation = true;
 
+  unsigned validated = 0;
+  unsigned failed = 0;
+
   auto *metadataMap = data->getMetadataMap();
   auto metadataMapSize = metadataMap->arraySize;
   auto *array = metadataMap->array();
@@ -267,8 +264,7 @@ void _swift_validatePrespecializedMetadata(unsigned *outValidated,
     if (!element.key || !element.value)
       continue;
 
-    if (outValidated)
-      (*outValidated)++;
+    validated++;
 
     const char *mangledName = element.key;
     // Skip the leading $.
@@ -282,12 +278,16 @@ void _swift_validatePrespecializedMetadata(unsigned *outValidated,
               "Prespecializations library validation: unable to build metadata "
               "for mangled name '%s'\n",
               mangledName);
-      if (outFailed)
-        (*outFailed)++;
+      failed++;
+      continue;
     }
 
     if (!compareGenericMetadata(result.getType().getMetadata(), element.value))
-      if (outFailed)
-        (*outFailed)++;
+      failed++;
   }
+
+  fprintf(stderr,
+          "Prespecializations library validation: validated %u entries, %u "
+          "failures.\n",
+          validated, failed);
 }