Skip to content

Avoid an infinite recursion in modules which import themselves #3802

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

Conversation

rjmccall
Copy link
Contributor

What's in this pull request?

Resolved bug number: (SR-)

rdar://27571492


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 test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

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

Protect the operator/precedencegroup lookup code against modules that import themselves.

It's not clear to me whether this situation is really intended, but
this does fix build modules with this strange situation.

@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test.

@rjmccall rjmccall force-pushed the recursive-source-file-import-protection branch from 6225bb4 to b2cf619 Compare July 27, 2016 22:20
@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test Linux.

@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test and merge.

@rjmccall
Copy link
Contributor Author

Apparently Michael G. has fixed the problem that was blocking the smoke testers. Let's try to placate the gods again.

@swift-ci Please smoke test and merge.

@rjmccall
Copy link
Contributor Author

Ah. It failed because everything is still being gated.

@gottesmm
Copy link
Contributor

@rjmccall smoke test and merge is not working with the new setup yet. You have to do a plain smoke test for the status on github to be set correctly. Once that is done you should be able to merge yourself by hand (it worked for Joe an hour ago). Restarting the build.

@gottesmm
Copy link
Contributor

@swift-ci Please smoke test

@rjmccall
Copy link
Contributor Author

Ah, I can guess how that works. That doesn't look like my problem, so I'll try yet again.

@swift-ci Please smoke test.

@rjmccall
Copy link
Contributor Author

Weird remote Java exception. Will try again later.

@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test.

import themselves.

It's not clear to me whether this situation is really intended, but
this does fix build modules with this strange situation.
@rjmccall rjmccall force-pushed the recursive-source-file-import-protection branch from 187e30d to cfd9b83 Compare July 29, 2016 17:51
@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test

@rjmccall rjmccall merged commit 2c85b5d into swiftlang:master Jul 29, 2016
@rjmccall rjmccall deleted the recursive-source-file-import-protection branch July 29, 2016 20:25
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