Skip to content

Fix crash during type checking when adding members to an extension. #4053

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 6, 2016
Merged

Conversation

rudkx
Copy link
Contributor

@rudkx rudkx commented Aug 5, 2016

What's in this pull request?

Cherry-picking a fix from master to the swift-3.0-branch.

Resolved bug number: (rdar://problem/27671033)


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.

If the extension ended up with ErrorType, we could crash while we
continue trying to process its body adding members.

Just bail out in this case.

rdar://problem/27671033

(code cherry picked from commit c9ec7e3)
(test cherry picked from commit 107d602)

If the extension ended up with ErrorType, we could crash while we
continue trying to process its body adding members.

Just bail out in this case.

rdar://problem/27671033

(code cherry picked from commit c9ec7e3)
(test cherry picked from commit 107d602)
@rudkx rudkx self-assigned this Aug 5, 2016
@rudkx
Copy link
Contributor Author

rudkx commented Aug 5, 2016

@swift-ci Test.

@rudkx
Copy link
Contributor Author

rudkx commented Aug 5, 2016

@DougGregor Can you review for the swift-3.0-branch?

@rudkx rudkx added this to the Swift 3.0 milestone Aug 5, 2016
@DougGregor
Copy link
Member

LGTM!

@DougGregor
Copy link
Member

@shahmishal the Linux failure is a problem on the builder:

14:27:37 Building remotely on Ubuntu-14.04-2 (Ubuntu-14.04) in workspace /home/buildnode/jenkins/workspace/swift-PR-Linux@2
14:27:37 > git rev-parse --is-inside-work-tree # timeout=10
14:27:37 Fetching changes from the remote Git repository
14:27:37 > git config remote.origin.url [email protected]:apple/swift.git # timeout=10
14:27:37 ERROR: Error fetching remote repo 'origin'
14:27:37 hudson.plugins.git.GitException: Failed to fetch from [email protected]:apple/swift.git
14:27:37 at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:763)
14:27:37 at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1012)
14:27:37 at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1043)
14:27:37 at org.jenkinsci.plugins.multiplescms.MultiSCM.checkout(MultiSCM.java:129)
14:27:37 at hudson.scm.SCM.checkout(SCM.java:485)
14:27:37 at hudson.model.AbstractProject.checkout(AbstractProject.java:1276)
14:27:37 at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:607)
14:27:37 at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
14:27:37 at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
14:27:37 at hudson.model.Run.execute(Run.java:1738)
14:27:37 at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
14:27:37 at hudson.model.ResourceController.execute(ResourceController.java:98)
14:27:37 at hudson.model.Executor.run(Executor.java:410)
14:27:37 Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url [email protected]:apple/swift.git" returned status code 4:
14:27:37 stdout:
14:27:37
stderr: error: failed to write new configuration file .git/config.lock
14:27:37

@DougGregor
Copy link
Member

@swift-ci please test Linux

@tkremenek tkremenek merged commit 2a87c50 into swiftlang:swift-3.0-branch Aug 6, 2016
@rudkx rudkx deleted the fix-27671033 branch August 7, 2016 22:36
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.

3 participants