Merge pull request #9385 from augusto2112/rename-prot-existential

[lldb][NFC] Rename functions from Protocol to Existential

Author: augusto2112

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

@@ -1945,24 +1945,24 @@ bool SwiftLanguageRuntimeImpl::IsValidErrorValue(ValueObject &in_value) {
   return true;
 }
 
-bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Protocol(
-    ValueObject &in_value, CompilerType protocol_type,
+bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Existential(
+    ValueObject &in_value, CompilerType existential_type,
     lldb::DynamicValueType use_dynamic, TypeAndOrName &class_type_or_name,
     Address &address) {
   Log *log(GetLog(LLDBLog::Types));
   auto tss =
-      protocol_type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>();
+      existential_type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>();
   if (!tss) {
     if (log)
       log->Printf("Could not get type system swift");
     return false;
   }
 
-  const swift::reflection::TypeRef *protocol_typeref =
-      GetTypeRef(protocol_type, &tss->GetTypeSystemSwiftTypeRef());
-  if (!protocol_typeref) {
+  const swift::reflection::TypeRef *existential_typeref =
+      GetTypeRef(existential_type, &tss->GetTypeSystemSwiftTypeRef());
+  if (!existential_typeref) {
     if (log)
-      log->Printf("Could not get protocol typeref");
+      log->Printf("Could not get existential typeref");
     return false;
   }
 
@@ -2006,7 +2006,7 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Protocol(
     return false;
 
   auto pair = reflection_ctx->ProjectExistentialAndUnwrapClass(
-      remote_existential, *protocol_typeref,
+      remote_existential, *existential_typeref,
       tss->GetTypeSystemSwiftTypeRef().GetDescriptorFinder());
   if (use_local_buffer)
     PopLocalBuffer();
@@ -2029,8 +2029,8 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Protocol(
 #ifndef NDEBUG
   if (ModuleList::GetGlobalModuleListProperties()
           .GetSwiftValidateTypeSystem()) {
-    auto reference_pair = GetDynamicTypeAndAddress_ProtocolRemoteAST(
-        in_value, protocol_type, use_local_buffer, existential_address);
+    auto reference_pair = GetDynamicTypeAndAddress_ExistentialRemoteAST(
+        in_value, existential_type, use_local_buffer, existential_address);
     assert(pair.has_value() >= reference_pair.has_value() &&
            "RemoteAST and runtime diverge");
 
@@ -2755,7 +2755,7 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress(
     success = GetDynamicTypeAndAddress_ExistentialMetatype(
         in_value, val_type, use_dynamic, class_type_or_name, address);
   else if (type_info.AnySet(eTypeIsProtocol))
-    success = GetDynamicTypeAndAddress_Protocol(in_value, val_type, use_dynamic,
+    success = GetDynamicTypeAndAddress_Existential(in_value, val_type, use_dynamic,
                                                 class_type_or_name, address);
   else {
     CompilerType bound_type;
@@ -2778,7 +2778,7 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress(
                                                use_dynamic, class_type_or_name,
                                                address, static_value_type);
     } else if (subst_type_info.AnySet(eTypeIsProtocol)) {
-      success = GetDynamicTypeAndAddress_Protocol(
+      success = GetDynamicTypeAndAddress_Existential(
           in_value, bound_type, use_dynamic, class_type_or_name, address);
     } else {
       success = GetDynamicTypeAndAddress_Value(in_value, bound_type,

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

@@ -251,14 +251,14 @@ class SwiftLanguageRuntimeImpl {
   ConstString GetDynamicTypeName_ClassRemoteAST(ValueObject &in_value,
                                                 lldb::addr_t instance_ptr);
 #endif
-  bool GetDynamicTypeAndAddress_Protocol(ValueObject &in_value,
+  bool GetDynamicTypeAndAddress_Existential(ValueObject &in_value,
                                          CompilerType protocol_type,
                                          lldb::DynamicValueType use_dynamic,
                                          TypeAndOrName &class_type_or_name,
                                          Address &address);
 #ifndef NDEBUG
   std::optional<std::pair<CompilerType, Address>>
-  GetDynamicTypeAndAddress_ProtocolRemoteAST(ValueObject &in_value,
+  GetDynamicTypeAndAddress_ExistentialRemoteAST(ValueObject &in_value,
                                              CompilerType protocol_type,
                                              bool use_local_buffer,
                                              lldb::addr_t existential_address);

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

@@ -220,8 +220,8 @@ ConstString SwiftLanguageRuntimeImpl::GetDynamicTypeName_ClassRemoteAST(
 }
 
 std::optional<std::pair<CompilerType, Address>>
-SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_ProtocolRemoteAST(
-    ValueObject &in_value, CompilerType protocol_type, bool use_local_buffer,
+SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_ExistentialRemoteAST(
+    ValueObject &in_value, CompilerType existential_type, bool use_local_buffer,
     lldb::addr_t existential_address) {
   // Dynamic type resolution in RemoteAST might pull in other Swift
   // modules, so use the scratch context where such operations are
@@ -245,7 +245,7 @@ SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_ProtocolRemoteAST(
   swift::remote::RemoteAddress remote_existential(existential_address);
   auto &remote_ast = GetRemoteASTContext(*swift_ast_ctx);
   auto swift_type =
-      llvm::expectedToStdOptional(swift_ast_ctx->GetSwiftType(protocol_type))
+      llvm::expectedToStdOptional(swift_ast_ctx->GetSwiftType(existential_type))
           .value_or(swift::Type());
   if (!swift_type)
     return {};