Merge pull request #9047 from bnbarham/cherry-lldb

[lldb] Cherry-pick a couple changes from rebranch

Author: bnbarham

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp

@@ -124,13 +124,13 @@ void SwiftASTManipulatorBase::DoInitialization() {
         }
       }
       // Not in an extension.
-      if (FD->getNameStr().equals("$__lldb_trampoline"))
+      if (FD->getNameStr() == "$__lldb_trampoline")
         trampoline_decl = FD;
-      else if (FD->getNameStr().equals("$__lldb_expr"))
+      else if (FD->getNameStr() == "$__lldb_expr")
         entrypoint_decl = FD;
-      else if (FD->getNameStr().equals("$__lldb_sink"))
+      else if (FD->getNameStr() == "$__lldb_sink")
         sink_decl = FD;
-      else if (FD->getNameStr().equals("$__lldb_user_expr"))
+      else if (FD->getNameStr() == "$__lldb_user_expr")
         user_expr_decl = FD;
       return Action::SkipChildren();
     }

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.h

@@ -114,7 +114,7 @@ class SwiftASTManipulatorBase {
       return m_name.str().starts_with("$τ_0_");
     }
     bool IsSelf() const {
-      return m_name.str().equals("$__lldb_injected_self");
+      return m_name.str() == "$__lldb_injected_self";
     }
     bool IsPackCount() const {
       return m_name.str().starts_with("$pack_count_");

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp

@@ -395,8 +395,8 @@ lldb::offset_t SwiftREPL::GetDesiredIndentation(const StringList &lines,
           // this as a cast statement
           bool outdent = false;
           if (line.empty())
-            outdent = !identifier.equals("case");
-          else if (identifier.equals("case")) {
+            outdent = (identifier != "case");
+          else if (identifier == "case") {
             outdent = true;
           } else {
             line = line.rtrim(); // Skip trailing spaces

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp

@@ -378,8 +378,8 @@ class EntityREPLPersistentVariable : public Materializer::Entity {
       if (last_component.empty())
         continue;
 
-      if (m_persistent_variable_sp->GetName().GetStringRef().equals(
-              last_component)) {
+      if (m_persistent_variable_sp->GetName().GetStringRef() ==
+              last_component) {
         ExecutionContextScope *exe_scope =
             execution_unit->GetBestExecutionContextScope();
 

lldb/source/Plugins/ExpressionParser/Swift/SwiftSILManipulator.cpp

@@ -70,7 +70,7 @@ swift::SILValue SwiftSILManipulator::emitLValueForVariable(
 
   for (swift::Decl *member : unsafe_mutable_pointer_struct_decl->getMembers()) {
     if (swift::VarDecl *member_var = llvm::dyn_cast<swift::VarDecl>(member)) {
-      if (member_var->getName().str().equals("_rawValue")) {
+      if (member_var->getName().str() == "_rawValue") {
         value_member_decl = member_var;
         break;
       }

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

@@ -169,7 +169,7 @@ FindSymbolForSwiftObject(Process &process, RuntimeKind runtime_kind,
     if (runtime_kind == RuntimeKind::ObjC) {
       auto *obj_file = target.GetExecutableModule()->GetObjectFile();
       bool have_objc_interop =
-          obj_file && obj_file->GetPluginName().equals("mach-o");
+          obj_file && obj_file->GetPluginName() == "mach-o";
       if (!have_objc_interop)
         return {};
     }
@@ -900,7 +900,7 @@ bool SwiftLanguageRuntimeImpl::AddModuleToReflectionContext(
   std::optional<uint32_t> info_id;
   // When dealing with ELF, we need to pass in the contents of the on-disk
   // file, since the Section Header Table is not present in the child process
-  if (obj_file->GetPluginName().equals("elf")) {
+  if (obj_file->GetPluginName() == "elf") {
     DataExtractor extractor;
     auto size = obj_file->GetData(0, obj_file->GetByteSize(), extractor);
     const uint8_t *file_data = extractor.GetDataStart();
@@ -910,7 +910,7 @@ bool SwiftLanguageRuntimeImpl::AddModuleToReflectionContext(
         std::optional<llvm::sys::MemoryBlock>(file_buffer),
         likely_module_names);
   } else if (read_from_file_cache &&
-             obj_file->GetPluginName().equals("mach-o")) {
+             obj_file->GetPluginName() == "mach-o") {
     info_id = AddObjectFileToReflectionContext(module_sp, likely_module_names);
     if (!info_id)
       info_id = m_reflection_ctx->AddImage(swift::remote::RemoteAddress(load_ptr),

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

@@ -1079,13 +1079,13 @@ void SwiftLanguageRuntime::MethodName::Parse() {
       if (was_operator)
         m_type = eTypeOperator;
       // check for obvious constructor/destructor cases
-      else if (m_basename.equals("__deallocating_destructor"))
+      else if (m_basename == "__deallocating_destructor")
         m_type = eTypeDeallocator;
-      else if (m_basename.equals("__allocating_constructor"))
+      else if (m_basename == "__allocating_constructor")
         m_type = eTypeAllocator;
-      else if (m_basename.equals("init"))
+      else if (m_basename == "init")
         m_type = eTypeConstructor;
-      else if (m_basename.equals("destructor"))
+      else if (m_basename == "destructor")
         m_type = eTypeDestructor;
       else
         m_type = eTypeUnknownMethod;

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.cpp

@@ -129,7 +129,7 @@ lldb::TypeSP DWARFASTParserSwift::ParseTypeFromDWARF(const SymbolContext &sc,
   }
 
   if (!mangled_name && name) {
-    if (name.GetStringRef().equals("$swift.fixedbuffer")) {
+    if (name.GetStringRef() == "$swift.fixedbuffer") {
       if (auto wrapped_type = get_type(die.GetFirstChild())) {
         // Create a unique pointer for the type + fixed buffer flag.
         type_sp = wrapped_type->GetSymbolFile()->CopyType(wrapped_type);

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -1937,7 +1937,9 @@ static std::string GetSDKPath(std::string m_description, XcodeSDK sdk) {
 /// Force parsing of the CUs to extract the SDK info.
 static std::string GetSDKPathFromDebugInfo(std::string m_description,
                                            Module &module) {
-
+#if !defined(__APPLE__)
+  return {};
+#else
   auto sdk_or_err = PlatformDarwin::GetSDKPathFromDebugInfo(module);
   if (!sdk_or_err) {
     Debugger::ReportError("Error while parsing SDK path from debug-info: " +
@@ -1954,6 +1956,7 @@ static std::string GetSDKPathFromDebugInfo(std::string m_description,
                       module.GetFileSpec().GetFilename().GetCString());
 
   return GetSDKPath(m_description, std::move(sdk));
+#endif
 }
 
 static std::vector<llvm::StringRef>

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -397,7 +397,7 @@ TypeSystemSwiftTypeRef::GetClangTypeNode(CompilerType clang_type,
   llvm::StringRef clang_name = clang_type.GetTypeName().GetStringRef();
 #define MAP_TYPE(C_TYPE_NAME, C_TYPE_KIND, C_TYPE_BITWIDTH, SWIFT_MODULE_NAME, \
                  SWIFT_TYPE_NAME, CAN_BE_MISSING, C_NAME_MAPPING)              \
-  if (clang_name.equals(C_TYPE_NAME)) {                                        \
+  if (clang_name == C_TYPE_NAME) {                                             \
     module_name = (SWIFT_MODULE_NAME);                                         \
     swift_name = (SWIFT_TYPE_NAME);                                            \
   } else
@@ -2271,7 +2271,7 @@ template <> bool Equivalent<CompilerType>(CompilerType l, CompilerType r) {
     return true;
 
   // SwiftASTContext hardcodes some less-precise types.
-  if (rhs.GetStringRef().equals("$sBpD"))
+  if (rhs.GetStringRef() == "$sBpD")
     return true;
 
   // If the type is a Clang-imported type ignore mismatches. Since we
@@ -2307,7 +2307,7 @@ template <> bool Equivalent<ConstString>(ConstString l, ConstString r) {
       return true;
 
     // If the new variant supports something the old one didn't, accept it.
-    if (r.IsEmpty() || r.GetStringRef().equals("<invalid>") ||
+    if (r.IsEmpty() || r.GetStringRef() == "<invalid>" ||
         r.GetStringRef().contains("__ObjC.") ||
         r.GetStringRef().contains(" -> ()"))
       return true;