Skip to content

[Type checker] Improve recovery from erroneous operators in types. #4459

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 2 commits into from
Aug 23, 2016

Conversation

DougGregor
Copy link
Member

What's in this pull request?

Fixes two different crashes reported when working with operators in types (SE-0091).

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


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.

Eliminates a crash due to missing ‘static’ on member operations. Fixes part of rdar://problem/27940842.
…, don’t check the application.

Eliminates an assertion that came up while investigating rdar://problem/27940842.
@DougGregor
Copy link
Member Author

@swift-ci please smoke test and merge

@DougGregor
Copy link
Member Author

@shahmishal , both of the smoke tests passed, but we get this exception when trying to merge:

PR[GHPullRequest@7ca4ef0a[base=org.kohsuke.github.GHCommitPointer@590c46e7,head=org.kohsuke.github.GHCommitPointer@7cc4e8dd,additions=26,merged=false,mergeable=true,deletions=0,assignee=,state=open,number=4459,comments=1,labels=,title=[Type checker] Improve recovery from erroneous operators in types.,milestone=,url=https://api.github.com/repos/apple/swift/pulls/4459,id=82403427]] is anonymous: false
ERROR: Step ‘Github Pull Request Merger’ aborted due to exception:
java.io.IOException: {"message":"Required status check "Swift Test OS X Platform (smoke test)" is expected","documentation_url":"https://help.github.com/articles/about-protected-branches"}
at org.kohsuke.github.Requester.handleApiError(Requester.java:594)
at org.kohsuke.github.Requester._to(Requester.java:272)
at org.kohsuke.github.Requester.to(Requester.java:213)
at org.kohsuke.github.Requester.to(Requester.java:201)
at org.kohsuke.github.GHPullRequest.merge(GHPullRequest.java:292)
at org.kohsuke.github.GHPullRequest.merge(GHPullRequest.java:278)
at org.jenkinsci.plugins.ghprb.GhprbPullRequestMerge.perform(GhprbPullRequestMerge.java:185)
at hudson.tasks.BuildStepMonitor$3.perform(BuildStepMonitor.java:45)
at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:782)
at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:723)
at hudson.model.Build$BuildExecution.post2(Build.java:185)
at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:668)
at hudson.model.Run.execute(Run.java:1763)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)
Caused by: org.kohsuke.github.HttpException: Server returned HTTP response code: 405, message: 'Method Not Allowed' for URL: https://api.github.com/repos/apple/swift/pulls/4459/merge
at org.kohsuke.github.Requester.parse(Requester.java:540)
at org.kohsuke.github.Requester._to(Requester.java:251)
... 14 more
Caused by: java.io.IOException: Server returned HTTP response code: 405 for URL: https://api.github.com/repos/apple/swift/pulls/4459/merge
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at java.lang.reflect.Constructor.newInstance(Constructor.java:422)
at sun.net.www.protocol.http.HttpURLConnection$10.run(HttpURLConnection.java:1890)
at sun.net.www.protocol.http.HttpURLConnection$10.run(HttpURLConnection.java:1885)
at java.security.AccessController.doPrivileged(Native Method)
at sun.net.www.protocol.http.HttpURLConnection.getChainedException(HttpURLConnection.java:1884)
at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1457)
at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1441)
at sun.net.www.protocol.https.HttpsURLConnectionImpl.getInputStream(HttpsURLConnectionImpl.java:254)
at org.kohsuke.github.Requester.parse(Requester.java:524)
... 15 more
Caused by: java.io.IOException: Server returned HTTP response code: 405 for URL: https://api.github.com/repos/apple/swift/pulls/4459/merge
at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1840)
at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1441)
at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:480)
at sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:338)
at org.kohsuke.github.Requester.parse(Requester.java:514)
... 15 more

@DougGregor DougGregor merged commit cc5e64d into swiftlang:master Aug 23, 2016
@DougGregor DougGregor deleted the fix-crashes-rdar27940842 branch August 23, 2016 18:06
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.

1 participant