Skip to content

[pull] swift/master from apple:swift/master #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2020
Merged

[pull] swift/master from apple:swift/master #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d4e7ca
[Swift] AST: Rename getFullName -> getName for apple/swift#31224
AnthonyLatsis Apr 23, 2020
f601e4a
Merge pull request #1107 from AnthonyLatsis/rename-getfullname-2-lldb
jckarter Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<swift::AccessorDecl>(decl)) {
result = accessor->getStorage()->getFullName();
result = accessor->getStorage()->getName();
return;
}

result = decl->getFullName();
result = decl->getName();
}
};

Expand Down