Parameterize CreateReflectionContext (NFC)

Author: adrian-prantl

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -517,23 +517,16 @@ void SwiftLanguageRuntimeImpl::SetupReflection() {
       objc_interop ? "with Objective-C interopability" : "Swift only";
 
   auto &triple = exe_module->GetArchitecture().GetTriple();
-  auto byte_size = m_process.GetAddressByteSize();
-  if (byte_size == 8) {
-    LLDB_LOGF(log, "Initializing a 64-bit reflection context (%s) for \"%s\"",
-              triple.str().c_str(), objc_interop_msg);
-    m_reflection_ctx = ReflectionContextInterface::CreateReflectionContext64(
-        this->GetMemoryReader(), objc_interop, GetSwiftMetadataCache());
-  } else if (byte_size == 4) {
-    LLDB_LOGF(log,
-              "Initializing a 32-bit reflection context (%s) for \"%s\"",
-              triple.str().c_str(), objc_interop_msg);
-    m_reflection_ctx = ReflectionContextInterface::CreateReflectionContext32(
-        this->GetMemoryReader(), objc_interop, GetSwiftMetadataCache());
-  } else {
-    LLDB_LOGF(log,
-              "Could not initialize reflection context for \"%s\"",
-              triple.str().c_str());
-  }
+  uint32_t ptr_size = m_process.GetAddressByteSize();
+  LLDB_LOG(log, "Initializing a {0}-bit reflection context ({1}) for \"{2}\"",
+           ptr_size * 8, triple.str(), objc_interop_msg);
+  if (ptr_size == 4 || ptr_size == 8)
+    m_reflection_ctx = ReflectionContextInterface::CreateReflectionContext(
+        ptr_size, this->GetMemoryReader(), objc_interop,
+        GetSwiftMetadataCache());
+  if (!m_reflection_ctx)
+    LLDB_LOG(log, "Could not initialize reflection context for \"{0}\"",
+             triple.str());
   // We set m_initialized_reflection_ctx to true here because
   // AddModuleToReflectionContext can potentially call into SetupReflection
   // again (which will early exit). This is safe to do since every other thread

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -387,37 +387,36 @@ class TargetReflectionContext
 } // namespace
 
 std::unique_ptr<SwiftLanguageRuntimeImpl::ReflectionContextInterface>
-SwiftLanguageRuntimeImpl::ReflectionContextInterface::CreateReflectionContext32(
-    std::shared_ptr<swift::remote::MemoryReader> reader, bool ObjCInterop,
-    SwiftMetadataCache *swift_metadata_cache) {
+SwiftLanguageRuntimeImpl::ReflectionContextInterface::CreateReflectionContext(
+    uint8_t ptr_size, std::shared_ptr<swift::remote::MemoryReader> reader,
+    bool ObjCInterop, SwiftMetadataCache *swift_metadata_cache) {
   using ReflectionContext32ObjCInterop =
       TargetReflectionContext<swift::reflection::ReflectionContext<
           swift::External<swift::WithObjCInterop<swift::RuntimeTarget<4>>>>>;
   using ReflectionContext32NoObjCInterop =
       TargetReflectionContext<swift::reflection::ReflectionContext<
           swift::External<swift::NoObjCInterop<swift::RuntimeTarget<4>>>>>;
-  if (ObjCInterop)
-    return std::make_unique<ReflectionContext32ObjCInterop>(
-        reader, swift_metadata_cache);
-  return std::make_unique<ReflectionContext32NoObjCInterop>(
-      reader, swift_metadata_cache);
-}
-
-std::unique_ptr<SwiftLanguageRuntimeImpl::ReflectionContextInterface>
-SwiftLanguageRuntimeImpl::ReflectionContextInterface::CreateReflectionContext64(
-    std::shared_ptr<swift::remote::MemoryReader> reader, bool ObjCInterop,
-    SwiftMetadataCache *swift_metadata_cache) {
   using ReflectionContext64ObjCInterop =
       TargetReflectionContext<swift::reflection::ReflectionContext<
           swift::External<swift::WithObjCInterop<swift::RuntimeTarget<8>>>>>;
   using ReflectionContext64NoObjCInterop =
       TargetReflectionContext<swift::reflection::ReflectionContext<
           swift::External<swift::NoObjCInterop<swift::RuntimeTarget<8>>>>>;
-  if (ObjCInterop)
-    return std::make_unique<ReflectionContext64ObjCInterop>(
+  if (ptr_size == 4) {
+    if (ObjCInterop)
+      return std::make_unique<ReflectionContext32ObjCInterop>(
+          reader, swift_metadata_cache);
+    return std::make_unique<ReflectionContext32NoObjCInterop>(
         reader, swift_metadata_cache);
-  return std::make_unique<ReflectionContext64NoObjCInterop>(
-      reader, swift_metadata_cache);
+  }
+  if (ptr_size == 8) {
+    if (ObjCInterop)
+      return std::make_unique<ReflectionContext64ObjCInterop>(
+          reader, swift_metadata_cache);
+    return std::make_unique<ReflectionContext64NoObjCInterop>(
+        reader, swift_metadata_cache);
+  }
+  return {};
 }
 
 SwiftLanguageRuntimeImpl::ReflectionContextInterface::

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeImpl.h

@@ -212,16 +212,10 @@ class SwiftLanguageRuntimeImpl {
   /// a specific pointer width.
   class ReflectionContextInterface {
   public:
-    /// Return a 32-bit reflection context.
+    /// Return a reflection context.
     static std::unique_ptr<ReflectionContextInterface>
-    CreateReflectionContext32(
-        std::shared_ptr<swift::remote::MemoryReader> reader, bool ObjCInterop,
-        SwiftMetadataCache *swift_metadata_cache);
-
-    /// Return a 64-bit reflection context.
-    static std::unique_ptr<ReflectionContextInterface>
-    CreateReflectionContext64(
-        std::shared_ptr<swift::remote::MemoryReader> reader, bool ObjCInterop,
+    CreateReflectionContext(uint8_t pointer_size,
+        std::shared_ptr<swift::remote::MemoryReader> reader, bool objc_interop,
         SwiftMetadataCache *swift_metadata_cache);
 
     virtual ~ReflectionContextInterface();