Skip to content

Fixing /IDE/crashers/016-swift-mangle-mangler-mangleidentifier.swift #6079

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 3 commits into from
Dec 6, 2016
Merged

Fixing /IDE/crashers/016-swift-mangle-mangler-mangleidentifier.swift #6079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faa78bd
Fixing /IDE/crashers/016-swift-mangle-mangler-mangleidentifier.swift
nkcsgexi Dec 5, 2016
3bbd786
Allow mangling accessors, which are nameless.
nkcsgexi Dec 5, 2016
4370807
Mark IDE/crashers/100-swift-mangle-mangler-mangledeclname.swift as fi…
nkcsgexi Dec 6, 2016
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
9 changes: 7 additions & 2 deletions lib/AST/Mangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ void Mangler::mangleEntity(const ValueDecl *decl,
unsigned uncurryLevel) {
assert(!isa<ConstructorDecl>(decl));
assert(!isa<DestructorDecl>(decl));

// entity ::= static? entity-kind context entity-name
if (decl->isStatic())
Buffer << 'Z';
Expand All @@ -1603,7 +1603,12 @@ void Mangler::mangleEntity(const ValueDecl *decl,
return mangleAccessorEntity(accessorKind, func->getAddressorKind(),
func->getAccessorStorageDecl());
}


// Avoid mangling nameless entity. This may happen in erroneous code as code
// completion.
if (!decl->hasName())
Copy link
Contributor

@slavapestov slavapestov Dec 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does it not have a name? Would it be better to ensure a name is always set? Or maybe we shouldn't be trying to mangle the entity in the first place? Or perhaps we should fix the mangler to just not allow this?

Copy link
Contributor Author

@nkcsgexi nkcsgexi Dec 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to improve the mangler to allow nameless entities, in this test case let:{. As far as i know, we don't have a default name to set on the var decl lead by let, so to fix mangler to be more forgiving is a reasonable solution.

return;

if (isa<VarDecl>(decl)) {
Buffer << 'v';
} else if (isa<SubscriptDecl>(decl)) {
Expand Down
3 changes: 0 additions & 3 deletions validation-test/IDE/crashers/016-swift-mangle-mangler-mangleidentifier.swift
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions validation-test/IDE/crashers/100-swift-mangle-mangler-mangledeclname.swift
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions validation-test/IDE/crashers_fixed/016-swift-mangle-mangler-mangleidentifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
// REQUIRES: asserts
var d{let:{func a#^A^#
2 changes: 2 additions & 0 deletions validation-test/IDE/crashers_fixed/100-swift-mangle-mangler-mangledeclname.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
{let:{class S(}#^A^#