fix conflict

Author: charles-zablit

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

@@ -1869,100 +1869,6 @@ std::string SwiftLanguage::GetFunctionDisplayArgs(
   return s.GetString().str();
 }
 
-bool SwiftLanguage::GetFunctionDisplayArgs(
-    VariableList &args, lldb_private::Stream &s, std::string display_name,
-    lldb_private::ExecutionContextScope *exe_scope) {
-  const char *cstr = display_name.data();
-  const char *open_paren = strchr(cstr, '(');
-  const char *close_paren = nullptr;
-  const char *generic = strchr(cstr, '<');
-  // If before the arguments list begins there is a template sign
-  // then scan to the end of the generic args before you try to find
-  // the arguments list.
-  const char *generic_start = generic;
-  if (generic && open_paren && generic < open_paren) {
-    int generic_depth = 1;
-    ++generic;
-    for (; *generic && generic_depth > 0; generic++) {
-      if (*generic == '<')
-        generic_depth++;
-      if (*generic == '>')
-        generic_depth--;
-    }
-    if (*generic)
-      open_paren = strchr(generic, '(');
-    else
-      open_paren = nullptr;
-  }
-  if (open_paren) {
-    close_paren = strchr(open_paren, ')');
-  }
-
-  if (open_paren && generic_start)
-    if (generic_start)
-      s.Write(generic_start, open_paren - generic_start + 1);
-    else
-      s.Write(cstr, open_paren - cstr + 1);
-  else {
-    s.PutChar('(');
-  }
-
-  const size_t num_args = args.GetSize();
-  for (size_t arg_idx = 0; arg_idx < num_args; ++arg_idx) {
-    std::string buffer;
-
-    VariableSP var_sp(args.GetVariableAtIndex(arg_idx));
-    ValueObjectSP var_value_sp(ValueObjectVariable::Create(exe_scope, var_sp));
-    if (!var_sp || !var_value_sp || var_sp->IsArtificial())
-      continue;
-    StreamString ss;
-    const char *var_representation = nullptr;
-    const char *var_name = var_value_sp->GetName().GetCString();
-    if (var_value_sp->GetCompilerType().IsValid()) {
-      if (var_value_sp && exe_scope->CalculateTarget())
-        var_value_sp = var_value_sp->GetQualifiedRepresentationIfAvailable(
-            exe_scope->CalculateTarget()
-                ->TargetProperties::GetPreferDynamicValue(),
-            exe_scope->CalculateTarget()
-                ->TargetProperties::GetEnableSyntheticValue());
-      if (var_value_sp->GetCompilerType().IsAggregateType() &&
-          DataVisualization::ShouldPrintAsOneLiner(*var_value_sp.get())) {
-        static StringSummaryFormat format(TypeSummaryImpl::Flags()
-                                              .SetHideItemNames(false)
-                                              .SetShowMembersOneLiner(true),
-                                          "");
-        format.FormatObject(var_value_sp.get(), buffer, TypeSummaryOptions());
-        var_representation = buffer.c_str();
-      } else
-        var_value_sp->DumpPrintableRepresentation(
-            ss,
-            ValueObject::ValueObjectRepresentationStyle::
-                eValueObjectRepresentationStyleSummary,
-            eFormatDefault,
-            ValueObject::PrintableRepresentationSpecialCases::eAllow, false);
-    }
-    if (ss.GetData() && ss.GetSize())
-      var_representation = ss.GetData();
-    if (arg_idx > 0)
-      s.PutCString(", ");
-    if (var_value_sp->GetError().Success()) {
-      if (var_representation)
-        s.Printf("%s=%s", var_name, var_representation);
-      else
-        s.Printf("%s=%s at %s", var_name,
-                 var_value_sp->GetTypeName().GetCString(),
-                 var_value_sp->GetLocationAsCString());
-    } else
-      s.Printf("%s=<unavailable>", var_name);
-  }
-
-  if (close_paren)
-    s.PutCString(close_paren);
-  else
-    s.PutChar(')');
-  return true;
-}
-
 void SwiftLanguage::GetExceptionResolverDescription(bool catch_on,
                                                     bool throw_on, Stream &s) {
   s.Printf("Swift Error breakpoint");