Merge pull request swiftlang#25629 from apple/revert-25617-pr-0749a889482066e40ee2f5681a4bb0020007fa7f

Revert "[reflection-dump] Teach reflection dump how to dump protocols from the __swift5_protos section of a .o"

Author: shahmishal

include/swift/ABI/Metadata.h

@@ -124,9 +124,9 @@ struct External {
 
   template <typename T, bool Nullable = false>
   using RelativeIndirectablePointer = int32_t;
-
+  
   template <typename T, bool Nullable = true>
-  using RelativeDirectPointer = RelativeDirectPointer<T, Nullable>;
+  using RelativeDirectPointer = int32_t;
 };
 
 /// Template for branching on native pointer types versus external ones

include/swift/Reflection/MetadataSourceBuilder.h

@@ -18,8 +18,6 @@
 #define SWIFT_REFLECTION_METADATASOURCEBUILDER_H
 
 #include "swift/Reflection/MetadataSource.h"
-#include <memory>
-#include <vector>
 
 namespace swift {
 namespace reflection {

include/swift/Reflection/ProtocolConformance.h

@@ -17,11 +17,9 @@
 #ifndef SWIFT_REFLECTION_RECORDS_H
 #define SWIFT_REFLECTION_RECORDS_H
 
-#include "swift/Basic/LLVM.h"
 #include "swift/Basic/RelativePointer.h"
 #include "swift/Demangling/Demangle.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
 
 namespace swift {
 

include/swift/Reflection/Records.h

@@ -224,26 +224,27 @@ class ReflectionContext
     auto CaptureSec = findMachOSectionByName("__swift5_capture");
     auto TypeRefMdSec = findMachOSectionByName("__swift5_typeref");
     auto ReflStrMdSec = findMachOSectionByName("__swift5_reflstr");
-    auto ProtocolSec = findMachOSectionByName("__swift5_protos");
 
-    if (FieldMdSec.first == nullptr && AssocTySec.first == nullptr &&
-        BuiltinTySec.first == nullptr && CaptureSec.first == nullptr &&
-        TypeRefMdSec.first == nullptr && ReflStrMdSec.first == nullptr &&
-        ProtocolSec.first == nullptr)
+    if (FieldMdSec.first == nullptr &&
+        AssocTySec.first == nullptr &&
+        BuiltinTySec.first == nullptr &&
+        CaptureSec.first == nullptr &&
+        TypeRefMdSec.first == nullptr &&
+        ReflStrMdSec.first == nullptr)
       return false;
 
     auto LocalStartAddress = reinterpret_cast<uint64_t>(SectBuf.get());
     auto RemoteStartAddress = static_cast<uint64_t>(RangeStart);
 
-    ReflectionInfo info = {{{FieldMdSec.first, FieldMdSec.second}, 0},
-                           {{AssocTySec.first, AssocTySec.second}, 0},
-                           {{BuiltinTySec.first, BuiltinTySec.second}, 0},
-                           {{CaptureSec.first, CaptureSec.second}, 0},
-                           {{TypeRefMdSec.first, TypeRefMdSec.second}, 0},
-                           {{ReflStrMdSec.first, ReflStrMdSec.second}, 0},
-                           {{ProtocolSec.first, ProtocolSec.second}, 0},
-                           LocalStartAddress,
-                           RemoteStartAddress};
+    ReflectionInfo info = {
+        {{FieldMdSec.first, FieldMdSec.second}, 0},
+        {{AssocTySec.first, AssocTySec.second}, 0},
+        {{BuiltinTySec.first, BuiltinTySec.second}, 0},
+        {{CaptureSec.first, CaptureSec.second}, 0},
+        {{TypeRefMdSec.first, TypeRefMdSec.second}, 0},
+        {{ReflStrMdSec.first, ReflStrMdSec.second}, 0},
+        LocalStartAddress,
+        RemoteStartAddress};
 
     this->addReflectionInfo(info);