Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[CSApply] Restructure the implicit AST when applying @dynamicCallable #23845

Merged
merged 2 commits into from Jul 6, 2019
Merged

[CSApply] Restructure the implicit AST when applying @dynamicCallable #23845

merged 2 commits into from Jul 6, 2019

Conversation

Azoy
Copy link
Member

@Azoy Azoy commented Apr 7, 2019

slavapestov
slavapestov approved these changes Apr 7, 2019
View reviewed changes
Copy link
Member

@slavapestov slavapestov left a comment

Choose a reason for hiding this comment

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

Looks good. In the future, instead of splitting the code change and test change into separate commits, I would instead suggest one commit per bug fix. This way it is clear which code change corresponds to which bug fix.

@slavapestov
Copy link
Member

@swift-ci Please smoke test

@slavapestov
Copy link
Member

@swift-ci Please test source compatibility

@dan-zheng
Copy link
Collaborator

Oops, I just found SR-9239 and completely missed SR-10313 - my bad.

@pschuh made similar @dynamicCallable changes in #22366, but didn't yet upstream changes from tensorflow branch to master.

So there may be some duplicate code and code divergence across branches. Not a big deal, except that it'd be nice (for the Swift for TensorFlow team) if someone could unify the code across the branches to facilitate downstreaming changes from master to tensorflow.

@Azoy
Copy link
Member Author

Azoy commented Apr 7, 2019

@dan-zheng Oh I hadn't noticed this was fixed on tensorflow. How would one go about unifying when this is ready?

@dan-zheng
Copy link
Collaborator

@dan-zheng Oh I hadn't noticed this was fixed on tensorflow. How would one go about unifying when this is ready?

It should just be a matter of copy-pasting the new code from one branch to the other. The new code on master seems a bit cleaner than the code on tensorflow, so I think copying from master to tensorflow makes sense.

Would you (please) like to help us unify code?

cc @pschuh

@Azoy
Copy link
Member Author

Azoy commented Apr 7, 2019

@slavapestov @dan-zheng alright this should be ready to go now.

dan-zheng
dan-zheng approved these changes Apr 7, 2019
View reviewed changes
Copy link
Collaborator

@dan-zheng dan-zheng left a comment

Choose a reason for hiding this comment

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

Awesome!

@jrose-apple
Copy link
Contributor

@swift-ci Please smoke test

Azoy added 2 commits July 5, 2019 20:46
@Azoy
Restructure implicit AST for @dynamicCallable
d0c727d 
add tests

dont assume dict type

dont assume member ref ast

formatting

more formatting

Update getTypeWitnessByName
@Azoy
Add test case for SR-10753
f48df2d
@Azoy
Copy link
Member Author

Azoy commented Jul 6, 2019 •
edited

@jrose-apple I've fixed the compile error and added a test case for SR-10753

@slavapestov
Copy link
Member

@swift-ci Please test

@slavapestov
Copy link
Member

@swift-ci Please test source compatibility

@swift-ci
Copy link
Collaborator

swift-ci commented Jul 6, 2019

Build failed
Swift Test Linux Platform
Git Sha - 654afa269b9c13b1674dd69a8670b4ccc1c16307

@swift-ci
Copy link
Collaborator

swift-ci commented Jul 6, 2019

Build failed
Swift Test OS X Platform
Git Sha - 654afa269b9c13b1674dd69a8670b4ccc1c16307

@jrose-apple jrose-apple self-assigned this Jul 6, 2019
@slavapestov slavapestov merged commit 703c39d into apple:master Jul 6, 2019
@Azoy Azoy deleted the sr-10313 branch July 6, 2019 18:10
Azoy pushed a commit to Azoy/swift that referenced this pull request Jul 8, 2019
@slavapestov @Azoy
Merge pull request apple#23845 from Azoy/sr-10313
234c9a1 
[CSApply] Restructure the implicit AST when applying @dynamicCallable
@dan-zheng dan-zheng mentioned this pull request Apr 7, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavapestov slavapestov slavapestov approved these changes

@dan-zheng dan-zheng dan-zheng approved these changes

Assignees

@jrose-apple jrose-apple

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Azoy @slavapestov @dan-zheng @jrose-apple @swift-ci