Skip to content

Don't set overrides on imported protocol requirements [5.0] #18376

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

Conversation

slavapestov
Copy link
Contributor

Fixes rdar://problem/42635132.

@slavapestov
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e440e1d

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@swift-ci clean test linux

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@swift-ci clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e440e1d

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@slavapestov
Copy link
Contributor Author

@shahmishal It looks like we're still checking out the wrong lldb branch?

/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp:598:34: error: no matching function for call to 'create'
02:53:26   result_loc_info.binding_decl = swift::PatternBindingDecl::create(
02:53:26                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/swift/include/swift/AST/Decl.h:1946:30: note: candidate function not viable: requires 6 arguments, but 7 were provided
02:53:26   static PatternBindingDecl *create(ASTContext &Ctx, SourceLoc StaticLoc,
02:53:26                              ^
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/swift/include/swift/AST/Decl.h:1952:30: note: candidate function not viable: requires 8 arguments, but 7 were provided
02:53:26   static PatternBindingDecl *create(ASTContext &Ctx, SourceLoc StaticLoc,
02:53:26                              ^
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp:1239:7: error: no matching function for call to 'create'
02:53:26       swift::PatternBindingDecl::create(
02:53:26       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/swift/include/swift/AST/Decl.h:1946:30: note: candidate function not viable: requires 6 arguments, but 7 were provided
02:53:26   static PatternBindingDecl *create(ASTContext &Ctx, SourceLoc StaticLoc,
02:53:26                              ^
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/swift/include/swift/AST/Decl.h:1952:30: note: candidate function not viable: requires 8 arguments, but 7 were provided
02:53:26   static PatternBindingDecl *create(ASTContext &Ctx, SourceLoc StaticLoc,
02:53:26                              ^
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp:1502:26: error: no member named 'getStorageKind' in 'swift::VarDecl'
02:53:26     if (variable.m_decl->getStorageKind() !=
02:53:26         ~~~~~~~~~~~~~~~  ^
02:53:26 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp:1503:37: error: no member named 'Computed' in 'swift::AbstractStorageDecl'
02:53:26         swift::AbstractStorageDecl::Computed)
02:53:26         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^

Maybe @rjmccall needs to cherry-pick some patches on the lldb side?

@rjmccall
Copy link
Contributor

rjmccall commented Jul 31, 2018

No, 012af55 (reacting to the change to AbstractStorageDecl) is in swift-5.0-branch, as is 906c4bf (reacting to the change to PatternBindingDecl). The build is just using swift-4.2-branch, as you can see from the log:

02:24:18 Updating '/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb'
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18 HEAD is now at 001624c Merge pull request #793 from jasonmolenda/r41372699-min-os-version-swift42
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18 No rebase in progress?
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18 Your branch is up-to-date with 'origin/swift-4.2-branch'.
02:24:18 Already on 'swift-4.2-branch'
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18
02:24:18 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.0-branch/lldb
02:24:18 HEAD is now at 001624c Merge pull request #793 from jasonmolenda/r41372699-min-os-version-swift42
02:24:18

001624c is indeed the current head of swift-lldb's swift-4.2-branch.

@slavapestov
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@swift-ci test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 1, 2018

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@fredriss Have you seen this before?

/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-swift-5.0-branch/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp:598:34: error: no matching function for call to 'create'
  result_loc_info.binding_decl = swift::PatternBindingDecl::create(
                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@fredriss
Copy link
Contributor

fredriss commented Aug 1, 2018

@shahmishal never seen this

@fredriss
Copy link
Contributor

fredriss commented Aug 1, 2018

There have been no modification involving PatternBindingDecl::create in LLDB since 2015...

@swift-ci
Copy link
Contributor

swift-ci commented Aug 1, 2018

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@rjmccall
Copy link
Contributor

rjmccall commented Aug 1, 2018

No, see my comment above. A patch to that code was committed on July 6th as apple/swift-lldb@906c4bf, and it should be in swift-5.0-branch.

@fredriss
Copy link
Contributor

fredriss commented Aug 1, 2018

Are you talking about 906c4bf? because according to 'git branch --contains' it is on swift-5.0-branch. But this patch doesn't touch the line where the error is reported

@fredriss
Copy link
Contributor

fredriss commented Aug 1, 2018

Doh, it touches exactly this piece of code, sorry. The commit is on swift-5.0-branch

@fredriss
Copy link
Contributor

fredriss commented Aug 1, 2018

Sorry, I'm reacting to Mishal's message, but I should have read the history of the PR. John analysis is exactly correct, this build has checked out the swift-4.2-branch in LLDB.

@slavapestov
Copy link
Contributor Author

@swift-ci Please test macOS

@swift-ci
Copy link
Contributor

swift-ci commented Aug 1, 2018

Build failed
Swift Test OS X Platform
Git Sha - e440e1d

@shahmishal
Copy link
Member

@swift-ci Please test macOS

@slavapestov slavapestov merged commit e9465a6 into swiftlang:swift-5.0-branch Aug 1, 2018
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.

5 participants