[ParseableInterface] Module-qualify protocol types and typealiases #22830

jrose-apple · 2019-02-22T22:35:38Z

Otherwise we can get in trouble when a local type is named, say, 'Sequence'. Slurps in the non-controversial parts of Harlan's #22799.

rdar://problem/48298527 and rdar://problem/49426322

jrose-apple · 2019-02-22T22:35:52Z

@swift-ci Please test

harlanhaskins · 2019-02-22T22:37:27Z

Should we also set PreferTypeRepr = false here?

jrose-apple · 2019-02-22T22:38:37Z

That was the controversial part. ;-) These changes can go in now and let me make progress on [latest test case] even before you/we work out the issues with dropping TypeReprs.

harlanhaskins · 2019-02-22T22:40:21Z

Sure, sounds good, then!

nathawes

LGTM!

swift-ci · 2019-02-22T23:35:28Z

Build failed
Swift Test Linux Platform
Git Sha - 8080db251230ebef07c6952b1c02cc212349d250

swift-ci · 2019-02-23T01:47:35Z

Build failed
Swift Test OS X Platform
Git Sha - 8080db251230ebef07c6952b1c02cc212349d250

jrose-apple · 2019-02-25T16:59:02Z

@swift-ci Please test

swift-ci · 2019-02-25T18:06:22Z

Build failed
Swift Test Linux Platform
Git Sha - 8080db251230ebef07c6952b1c02cc212349d250

swift-ci · 2019-02-25T18:33:17Z

Build failed
Swift Test OS X Platform
Git Sha - 8080db251230ebef07c6952b1c02cc212349d250

jrose-apple · 2019-02-28T02:20:20Z

@nkcsgexi This changes some but not all of the generic signatures in the API digester output and the SourceKit document structure, and that seems…concerning?

jrose-apple · 2019-02-28T02:20:24Z

@swift-ci Please test

swift-ci · 2019-02-28T02:36:55Z

Build failed
Swift Test Linux Platform
Git Sha - 6a08e873183272ff8cb0c69da28ca6fefeadeaa4

swift-ci · 2019-02-28T04:08:51Z

Build failed
Swift Test OS X Platform
Git Sha - 6a08e873183272ff8cb0c69da28ca6fefeadeaa4

jrose-apple · 2019-02-28T04:39:41Z

Oops, I think I forgot to amend a commit.

jrose-apple · 2019-02-28T17:50:44Z

@swift-ci Please test macOS

swift-ci · 2019-02-28T17:54:53Z

Build failed
Swift Test OS X Platform
Git Sha - 6a08e873183272ff8cb0c69da28ca6fefeadeaa4

jrose-apple · 2019-02-28T23:54:10Z

@swift-ci Please test

swift-ci · 2019-02-28T23:56:20Z

Build failed
Swift Test Linux Platform
Git Sha - 6a08e873183272ff8cb0c69da28ca6fefeadeaa4

swift-ci · 2019-03-01T06:09:33Z

Build failed
Swift Test OS X Platform
Git Sha - ff3a087

jrose-apple · 2019-03-01T16:28:42Z

Oh, I actually did break this thing in LLDB. Whoops.

@escaping is implied here, and invalid when explicitly used. rdar://48298527

This is only relevant to the standard library, but previously we would not print `Builtin.` before builtin types. Make sure we do.

jrose-apple · 2019-03-29T01:29:19Z

apple/swift-lldb#1417
@swift-ci Please test

swift-ci · 2019-03-29T03:16:55Z

Build failed
Swift Test OS X Platform
Git Sha - b94984cd89fb193bdaf89cfd53b3eb6b2246208a

harlanhaskins · 2019-03-29T04:01:57Z

Command Output (stderr):
--
<unknown>:0: error: error opening '/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/api-digester/Output/compare-dump.swift.tmp.mod1/cake.swiftmodule' for output: No such file or directory

--

?

jrose-apple · 2019-03-29T15:48:46Z

*obligatory Portal reference*

I forgot to actually create the new directories I was relying on, will fix.

Otherwise we can get in trouble when a local type is named, say, 'Sequence'. Also contains test updates and a fix for Harlan's previous commit, which actually affects all typealiases, not just those in the Builtin module.

jrose-apple · 2019-03-29T15:54:02Z

apple/swift-lldb#1417
@swift-ci Please test macOS

jrose-apple · 2019-03-29T15:54:09Z

apple/swift-lldb#1417
@swift-ci Please smoke test Linux

swift-ci · 2019-03-29T15:58:05Z

Build failed
Swift Test OS X Platform
Git Sha - b94984cd89fb193bdaf89cfd53b3eb6b2246208a

[ParseableInterface] Module-qualify protocol types and typealiases (cherry picked from commit b5610e7)

jrose-apple requested review from harlanhaskins and nathawes February 22, 2019 22:35

nathawes approved these changes Feb 22, 2019

View reviewed changes

harlanhaskins approved these changes Feb 22, 2019

View reviewed changes

slavapestov approved these changes Feb 22, 2019

View reviewed changes

jrose-apple force-pushed the a-qualified-yes branch from 8080db2 to 6a08e87 Compare February 28, 2019 02:19

jrose-apple force-pushed the a-qualified-yes branch from 6a08e87 to ff3a087 Compare February 28, 2019 17:50

jrose-apple mentioned this pull request Mar 1, 2019

[ParseableInterface] Hack: prefer module names over type names #23000

Closed

jrose-apple mentioned this pull request Mar 29, 2019

[Swift] The AST printer now qualifies type names more consistently apple/swift-lldb#1417

Merged

[ParseableInterfaces] Don’t print @escaping on enum elements

2b10c4c

@escaping is implied here, and invalid when explicitly used. rdar://48298527

[ParseableInterfaces] Print Builtin. before builtin types

a49fea5

This is only relevant to the standard library, but previously we would not print `Builtin.` before builtin types. Make sure we do.

jrose-apple force-pushed the a-qualified-yes branch from ff3a087 to b94984c Compare March 29, 2019 01:28

[ParseableInterface] Module-qualify protocol types too

42522ca

Otherwise we can get in trouble when a local type is named, say, 'Sequence'. Also contains test updates and a fix for Harlan's previous commit, which actually affects all typealiases, not just those in the Builtin module.

jrose-apple force-pushed the a-qualified-yes branch from b94984c to 42522ca Compare March 29, 2019 15:52

jrose-apple merged commit b5610e7 into swiftlang:master Mar 29, 2019

jrose-apple deleted the a-qualified-yes branch March 29, 2019 19:51

jrose-apple added a commit to jrose-apple/swift that referenced this pull request Mar 29, 2019

Merge pull request swiftlang#22830 from jrose-apple/a-qualified-yes

a54d67e

[ParseableInterface] Module-qualify protocol types and typealiases (cherry picked from commit b5610e7)

jrose-apple added a commit to jrose-apple/swift that referenced this pull request Mar 29, 2019

Merge pull request swiftlang#22830 from jrose-apple/a-qualified-yes

9f5731c

[ParseableInterface] Module-qualify protocol types and typealiases (cherry picked from commit b5610e7)

This was referenced Mar 29, 2019

[5.1] [ParseableInterface] Module-qualify protocol types and typealiases #23666

Merged

[5.1 EARLY] [ParseableInterface] Module-qualify protocol types and typealiases #23667

Merged

jrose-apple added a commit that referenced this pull request Mar 29, 2019

Merge pull request #22830 from jrose-apple/a-qualified-yes (#23666)

3cbbaeb

[ParseableInterface] Module-qualify protocol types and typealiases (cherry picked from commit b5610e7)

[ParseableInterface] Module-qualify protocol types and typealiases #22830

[ParseableInterface] Module-qualify protocol types and typealiases #22830

Uh oh!

Conversation

jrose-apple commented Feb 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jrose-apple commented Feb 22, 2019

Uh oh!

harlanhaskins commented Feb 22, 2019

Uh oh!

jrose-apple commented Feb 22, 2019

Uh oh!

harlanhaskins commented Feb 22, 2019

Uh oh!

nathawes left a comment

Choose a reason for hiding this comment

Uh oh!

swift-ci commented Feb 22, 2019

Uh oh!

swift-ci commented Feb 23, 2019

Uh oh!

jrose-apple commented Feb 25, 2019

Uh oh!

swift-ci commented Feb 25, 2019

Uh oh!

swift-ci commented Feb 25, 2019

Uh oh!

jrose-apple commented Feb 28, 2019

Uh oh!

jrose-apple commented Feb 28, 2019

Uh oh!

swift-ci commented Feb 28, 2019

Uh oh!

swift-ci commented Feb 28, 2019

Uh oh!

jrose-apple commented Feb 28, 2019

Uh oh!

jrose-apple commented Feb 28, 2019

Uh oh!

swift-ci commented Feb 28, 2019

Uh oh!

jrose-apple commented Feb 28, 2019

Uh oh!

swift-ci commented Feb 28, 2019

Uh oh!

swift-ci commented Mar 1, 2019

Uh oh!

jrose-apple commented Mar 1, 2019

Uh oh!

jrose-apple commented Mar 29, 2019

Uh oh!

swift-ci commented Mar 29, 2019

Uh oh!

harlanhaskins commented Mar 29, 2019

Uh oh!

jrose-apple commented Mar 29, 2019

Uh oh!

jrose-apple commented Mar 29, 2019

Uh oh!

jrose-apple commented Mar 29, 2019

Uh oh!

swift-ci commented Mar 29, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jrose-apple commented Feb 22, 2019 •

edited

Loading