diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp index eafe2a695df3e..0dfa2a6d8d00f 100644 --- a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp +++ b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp @@ -326,7 +326,7 @@ class LLDBExprNameLookup : public LLDBNameLookup { swift::ValueDecl *value_decl = persistent_results[idx]; if (!value_decl) continue; - swift::DeclName value_decl_name = value_decl->getFullName(); + swift::DeclName value_decl_name = value_decl->getName(); swift::DeclKind value_decl_kind = value_decl->getKind(); swift::CanType value_interface_type = value_decl->getInterfaceType()->getCanonicalType(); @@ -339,7 +339,7 @@ class LLDBExprNameLookup : public LLDBNameLookup { if (swift::ValueDecl *rv_decl = RV[rv_idx].getValueDecl()) { if (value_decl_kind == rv_decl->getKind()) { if (is_function) { - swift::DeclName rv_full_name = rv_decl->getFullName(); + swift::DeclName rv_full_name = rv_decl->getName(); if (rv_full_name.matchesRef(value_decl_name)) { // If the full names match, make sure the // interface types match: diff --git a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp index 52e04794919ff..9abf0ff3b9877 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp @@ -128,11 +128,11 @@ static std::string TranslateObjCNameToSwiftName(std::string className, // If the decl is actually an accessor, use the property name instead. swift::AbstractFunctionDecl *decl = funcs.front(); if (auto accessor = llvm::dyn_cast(decl)) { - result = accessor->getStorage()->getFullName(); + result = accessor->getStorage()->getName(); return; } - result = decl->getFullName(); + result = decl->getName(); } };