Renamed IsCPPMangledName to IsMangledName.

Added NO_PLUGIN_DEPENDENCIES.

Author: slydiman

lldb/include/lldb/Core/Mangled.h

@@ -246,7 +246,7 @@ class Mangled {
   ///     for s, otherwise the enumerator for the mangling scheme detected.
   static Mangled::ManglingScheme GetManglingScheme(llvm::StringRef const name);
 
-  static bool IsCPPMangledName(llvm::StringRef name);
+  static bool IsMangledName(llvm::StringRef name);
 
   /// Decode a serialized version of this object from data.
   ///

lldb/source/Core/CMakeLists.txt

@@ -16,8 +16,7 @@ if (LLDB_ENABLE_CURSES)
   endif()
 endif()
 
-# TODO: Add property `NO_PLUGIN_DEPENDENCIES` to lldbCore
-add_lldb_library(lldbCore
+add_lldb_library(lldbCore NO_PLUGIN_DEPENDENCIES
   Address.cpp
   AddressRange.cpp
   AddressRangeListImpl.cpp

lldb/source/Core/Mangled.cpp

@@ -33,15 +33,10 @@
 #include <cstring>
 using namespace lldb_private;
 
-static inline bool cstring_is_mangled(llvm::StringRef s) {
-  return Mangled::GetManglingScheme(s) != Mangled::eManglingSchemeNone;
-}
-
 #pragma mark Mangled
 
-bool Mangled::IsCPPMangledName(llvm::StringRef name) {
-  Mangled::ManglingScheme scheme = Mangled::GetManglingScheme(name);
-  return (scheme != Mangled::eManglingSchemeNone);
+bool Mangled::IsMangledName(llvm::StringRef name) {
+  return Mangled::GetManglingScheme(name) != Mangled::eManglingSchemeNone;
 }
 
 Mangled::ManglingScheme Mangled::GetManglingScheme(llvm::StringRef const name) {
@@ -126,7 +121,7 @@ int Mangled::Compare(const Mangled &a, const Mangled &b) {
 
 void Mangled::SetValue(ConstString name) {
   if (name) {
-    if (cstring_is_mangled(name.GetStringRef())) {
+    if (IsMangledName(name.GetStringRef())) {
       m_demangled.Clear();
       m_mangled = name;
     } else {

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

@@ -36,6 +36,7 @@
 #include "lldb/Symbol/Variable.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
+#include "lldb/Target/Language.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StackFrame.h"
@@ -57,7 +58,6 @@
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 
-#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
 #include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h"
 #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"
 
@@ -1811,7 +1811,7 @@ void ClangExpressionDeclMap::AddOneFunction(NameSearchContext &context,
     const auto lang = function->GetCompileUnit()->GetLanguage();
     const auto name = function->GetMangled().GetMangledName().AsCString();
     const bool extern_c =
-        (Language::LanguageIsC(lang) && !Mangled::IsCPPMangledName(name)) ||
+        (Language::LanguageIsC(lang) && !Mangled::IsMangledName(name)) ||
         (Language::LanguageIsObjC(lang) &&
          !Language::LanguageIsCPlusPlus(lang));
 

lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp

@@ -72,7 +72,7 @@ CPlusPlusLanguage::GetMethodName(ConstString full_name) const {
 
 std::pair<FunctionNameType, llvm::StringRef>
 CPlusPlusLanguage::GetFunctionNameInfo(ConstString name) const {
-  if (Mangled::IsCPPMangledName(name.GetCString()))
+  if (Mangled::IsMangledName(name.GetCString()))
     return {eFunctionNameTypeFull, llvm::StringRef()};
 
   FunctionNameType func_name_type = eFunctionNameTypeNone;
@@ -99,7 +99,7 @@ CPlusPlusLanguage::GetFunctionNameInfo(ConstString name) const {
 
 bool CPlusPlusLanguage::SymbolNameFitsToLanguage(Mangled mangled) const {
   const char *mangled_name = mangled.GetMangledName().GetCString();
-  return mangled_name && Mangled::IsCPPMangledName(mangled_name);
+  return mangled_name && Mangled::IsMangledName(mangled_name);
 }
 
 ConstString CPlusPlusLanguage::GetDemangledFunctionNameWithoutArguments(

lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp

@@ -1279,7 +1279,7 @@ void SymbolFilePDB::CacheFunctionNames() {
       if (name.empty())
         continue;
 
-      if (Mangled::IsCPPMangledName(name.c_str())) {
+      if (Mangled::IsMangledName(name.c_str())) {
         // PDB public symbol has mangled name for its associated function.
         if (auto vm_addr = pub_sym_up->getVirtualAddress()) {
           if (auto it = addr_ids.find(vm_addr); it != addr_ids.end())