Merge pull request #24574 from dcci/boundaries-reflection-5.1

Author: swift-ci

include/swift/Reflection/Records.h

@@ -85,10 +85,12 @@ class FieldRecord {
       (const char *)((uintptr_t)MangledTypeName.get() + Offset));
   }
 
-  StringRef getFieldName(uintptr_t Offset)  const {
-    if (FieldName)
-      return (const char *)((uintptr_t)FieldName.get() + Offset);
-    return "";
+  StringRef getFieldName(uintptr_t Offset, uintptr_t Low,
+                         uintptr_t High) const {
+    uintptr_t nameAddr = (uintptr_t)FieldName.get() + Offset;
+    if (nameAddr < Low || nameAddr > High)
+      return "";
+    return (const char *)nameAddr;
   }
 
   bool isIndirectCase() const {

stdlib/public/Reflection/TypeRefBuilder.cpp

@@ -194,7 +194,9 @@ bool TypeRefBuilder::getFieldTypeRefs(
                        - FD.second->TypeReference.SectionOffset;
     auto FieldOffset = FD.second->Field.SectionOffset
                      - FD.second->ReflectionString.SectionOffset;
-    auto FieldName = Field.getFieldName(FieldOffset);
+    auto Low = (uintptr_t)(FD.second->ReflectionString.Metadata.startAddress());
+    auto High = (uintptr_t)(FD.second->ReflectionString.Metadata.endAddress());
+    auto FieldName = Field.getFieldName(FieldOffset, Low, High);
 
     // Empty cases of enums do not have a type
     if (FD.first->isEnum() && !Field.hasMangledTypeName()) {
@@ -339,8 +341,10 @@ void TypeRefBuilder::dumpFieldSection(std::ostream &OS) {
         OS << '-';
       OS << '\n';
       for (auto &field : descriptor) {
-        OS << std::string(field.getFieldName(NameOffset).begin(),
-                          field.getFieldName(NameOffset).end());
+        auto Low = (uintptr_t)sections.ReflectionString.Metadata.startAddress();
+        auto High = (uintptr_t)sections.ReflectionString.Metadata.endAddress();
+        OS << std::string(field.getFieldName(NameOffset, Low, High).begin(),
+                          field.getFieldName(NameOffset, Low, High).end());
         if (field.hasMangledTypeName()) {
           OS << ": ";
           dumpTypeRef(field.getMangledTypeName(TypeRefOffset), OS);

stdlib/public/runtime/ReflectionMirror.mm

@@ -327,7 +327,8 @@ static bool _shouldReportMissingReflectionMetadataWarnings() {
 
   const FieldDescriptor &descriptor = *fields;
   auto &field = descriptor.getFields()[index];
-  auto name = field.getFieldName(0);
+  // Bounds are always valid as the offset is constant.
+  auto name = field.getFieldName(0, 0, std::numeric_limits<uint64_t>::max());
 
   // Enum cases don't always have types.
   if (!field.hasMangledTypeName())