Skip to content

Commit f601e4a

Browse files
authored
Merge pull request #1107 from AnthonyLatsis/rename-getfullname-2-lldb
[Swift] AST: Rename getFullName -> getName for swiftlang/swift#31224
2 parents dcc89a2 + 1d4e7ca commit f601e4a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class LLDBExprNameLookup : public LLDBNameLookup {
326326
swift::ValueDecl *value_decl = persistent_results[idx];
327327
if (!value_decl)
328328
continue;
329-
swift::DeclName value_decl_name = value_decl->getFullName();
329+
swift::DeclName value_decl_name = value_decl->getName();
330330
swift::DeclKind value_decl_kind = value_decl->getKind();
331331
swift::CanType value_interface_type =
332332
value_decl->getInterfaceType()->getCanonicalType();
@@ -339,7 +339,7 @@ class LLDBExprNameLookup : public LLDBNameLookup {
339339
if (swift::ValueDecl *rv_decl = RV[rv_idx].getValueDecl()) {
340340
if (value_decl_kind == rv_decl->getKind()) {
341341
if (is_function) {
342-
swift::DeclName rv_full_name = rv_decl->getFullName();
342+
swift::DeclName rv_full_name = rv_decl->getName();
343343
if (rv_full_name.matchesRef(value_decl_name)) {
344344
// If the full names match, make sure the
345345
// interface types match:

Diff for: lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ static std::string TranslateObjCNameToSwiftName(std::string className,
128128
// If the decl is actually an accessor, use the property name instead.
129129
swift::AbstractFunctionDecl *decl = funcs.front();
130130
if (auto accessor = llvm::dyn_cast<swift::AccessorDecl>(decl)) {
131-
result = accessor->getStorage()->getFullName();
131+
result = accessor->getStorage()->getName();
132132
return;
133133
}
134134

135-
result = decl->getFullName();
135+
result = decl->getName();
136136
}
137137
};
138138

0 commit comments

Comments
 (0)