Skip to content

[SEMA] SR-6207: Fix misleading error for unqualified use of static variable from instance method #12644

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

Closed
wants to merge 7 commits into from
Closed

[SEMA] SR-6207: Fix misleading error for unqualified use of static variable from instance method #12644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
49ba381
add error definition
OscarSwanros Oct 26, 2017
04de483
Check for DeclRefExpr
OscarSwanros Oct 26, 2017
f98c1e2
initial test
OscarSwanros Oct 26, 2017
8d58457
Check if the base expression is a either a DeclRefExpr or a MemberRef…
OscarSwanros Oct 27, 2017
e5e3383
Move tests locations
OscarSwanros Oct 27, 2017
0c8f0b1
remove whitespace
OscarSwanros Oct 27, 2017
ad67c87
Update desc
OscarSwanros Oct 27, 2017
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
3 changes: 3 additions & 0 deletions include/swift/AST/DiagnosticsSema.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ ERROR(could_not_use_type_member,none,
ERROR(could_not_use_type_member_on_instance,none,
"static member %1 cannot be used on instance of type %0",
(Type, DeclName))
ERROR(could_not_use_type_member_on_instance_without_name,none,
"static member %0 cannot be referenced as an instance member",
(DeclName))
ERROR(could_not_use_enum_element_on_instance,none,
"enum element %0 cannot be referenced as an instance member",
(DeclName))
Expand Down
8 changes: 6 additions & 2 deletions lib/Sema/CSDiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,12 +1243,16 @@ diagnoseTypeMemberOnInstanceLookup(Type baseObjTy,
return;
}

if (isa<EnumElementDecl>(member))
if (isa<EnumElementDecl>(member)) {
Diag.emplace(diagnose(loc, diag::could_not_use_enum_element_on_instance,
memberName));
else
} else if (isa<DeclRefExpr>(baseExpr) || isa<MemberRefExpr>(baseExpr)) {
Diag.emplace(diagnose(loc, diag::could_not_use_type_member_on_instance_without_name,
memberName));
} else {
Diag.emplace(diagnose(loc, diag::could_not_use_type_member_on_instance,
baseObjTy, memberName));
}

Diag->highlight(nameLoc.getSourceRange());

Expand Down
8 changes: 8 additions & 0 deletions test/Constraints/members.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,3 +464,11 @@ struct Outer {
}
}
}

struct HasStaticSR6207 {
func foo() {
print(cvar) // expected-error {{static element cvar cannot be referenced as an instance member}}
}

static let cvar = 123
}