Skip to content

Switch override checking over to access scopes. #4508

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.

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 1 commit into from
Aug 26, 2016

Conversation

jrose-apple
Copy link
Contributor

The class version of f65ad81. Fixes some incorrect diagnostics.

We really do need SR-2209 to make this all cleaner.

rdar://problem/27820665


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please clean test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please clean test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform
Linux platform @swift-ci Please clean test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

matchDecl->getModuleContext() != decl->getModuleContext() &&
!isa<ConstructorDecl>(decl)) {
TC.diagnose(decl, diag::override_of_non_open,
decl->getDescriptiveKind());
} else if (matchAccess == Accessibility::Open && !matchDecl->isFinal() &&
Copy link
Contributor Author

Choose a reason for hiding this comment

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

sigh This is supposed to be decl. I knew I was forgetting a test case.

@jrose-apple jrose-apple force-pushed the override-access-scopes branch from 0a2c0f2 to 6dbb0b5 Compare August 26, 2016 02:02
The class version of f65ad81. Fixes some incorrect diagnostics.

We really do need https://bugs.swift.org/browse/SR-2209 to make
this all cleaner.

rdar://problem/27820665
@jrose-apple jrose-apple force-pushed the override-access-scopes branch from 6dbb0b5 to 9a217b5 Compare August 26, 2016 02:05
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

1 similar comment
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@jrose-apple jrose-apple merged commit 8b1ce7d into swiftlang:master Aug 26, 2016
@jrose-apple jrose-apple deleted the override-access-scopes branch August 26, 2016 16:07
@jrose-apple
Copy link
Contributor Author

@rjmccall, mind reviewing this?

@jrose-apple
Copy link
Contributor Author

@rjmccall review ping

@rjmccall
Copy link
Contributor

rjmccall commented Sep 2, 2016

LGTM.

jrose-apple added a commit to jrose-apple/swift that referenced this pull request Sep 3, 2016
The class version of f65ad81. Fixes some incorrect diagnostics.

We really do need https://bugs.swift.org/browse/SR-2209 to make
this all cleaner.

rdar://problem/27820665
(cherry picked from commit 8b1ce7d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants