Skip to content

[AST] Block recursion through ProtocolDecl::getInheritedProtocols(). #17278

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
Jun 16, 2018

Conversation

DougGregor
Copy link
Member

No description provided.

@DougGregor
Copy link
Member Author

@swift-ci please smoke test and merge

@@ -520,7 +520,10 @@ class alignas(1 << DeclAlignInBits) Decl {
KnownProtocol : 8, // '8' for speed. This only needs 6.

/// The number of requirements in the requirement signature.
NumRequirementsInSignature : 16
NumRequirementsInSignature : 16,
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like this, and other changes, are indented with tabs instead of spaces, like the rest of the file?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yikes, good catch. My editor has gone nuts.

Copy link
Member Author

Choose a reason for hiding this comment

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

(I'll clean them up shortly; for now, I need to unblock CI)

Copy link
Member Author

Choose a reason for hiding this comment

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

Whitespace cleaned up in #17277, thank you!

@DougGregor
Copy link
Member Author

@swift-ci please smoke test and merge

1 similar comment
@DougGregor
Copy link
Member Author

@swift-ci please smoke test and merge

@DougGregor DougGregor merged commit 9586cd7 into swiftlang:master Jun 16, 2018
@DougGregor DougGregor deleted the inherited-protos-recurse branch June 16, 2018 14:49
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.

2 participants