Skip to content

Use a special DeclBaseName for init #15201

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
Merged
merged 2 commits into from
Mar 16, 2018
Merged

Use a special DeclBaseName for init #15201

merged 2 commits into from
Mar 16, 2018

Conversation

slavapestov
Copy link
Contributor

@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

jrose-apple
jrose-apple reviewed Mar 13, 2018
View reviewed changes
lib/IRGen/GenProto.cpp Outdated
LookUpConformanceInModule(IGF.getSwiftModule()));
}
}

Copy link
Contributor

Choose a reason for hiding this comment

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

All this IRGen stuff should probably go in another PR, even if it's correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, I'll rebase shortly. 'WIP' also means "not ready for review" :) Actually main things its missing is tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

... and apparently it doesn't compile. I'll tag you once its done.

@slavapestov slavapestov force-pushed the special-init-name branch 2 times, most recently from 23afe7c to f4813d4 Compare March 14, 2018 00:15
jrose-apple
jrose-apple reviewed Mar 14, 2018
View reviewed changes
lib/AST/ASTContext.cpp Outdated
@@ -4289,6 +4289,9 @@ void DeclName::CompoundDeclName::Profile(llvm::FoldingSetNodeID &id,

void DeclName::initialize(ASTContext &C, DeclBaseName baseName,
ArrayRef<Identifier> argumentNames) {
if (!baseName.isSpecial())
assert(baseName.getIdentifier() != C.getIdentifier("init"));
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this the very thing that will break with `init`?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The assertion is only temporary while I work out some other issues.

@slavapestov slavapestov force-pushed the special-init-name branch 2 times, most recently from c92de93 to 84a1239 Compare March 15, 2018 05:31
@slavapestov slavapestov mentioned this pull request Mar 15, 2018
Merged
@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

1 similar comment
@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov slavapestov mentioned this pull request Mar 16, 2018
Merged
@slavapestov slavapestov force-pushed the special-init-name branch 2 times, most recently from 3ecd81e to f3f5cf8 Compare March 16, 2018 01:19
@slavapestov
Copy link
Contributor Author

@swift-ci Please test

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - a807f67a04610c554f02512d7efc0fa222c9cce7

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - e22acf6

@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov
Copy link
Contributor Author

@swift-ci Please test

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov
Copy link
Contributor Author

@swift-ci Please test

@slavapestov slavapestov changed the title [WIP] Use a special DeclBaseName for init Use a special DeclBaseName for init Mar 16, 2018
@slavapestov slavapestov merged commit 821bfdb into swiftlang:master Mar 16, 2018
@slavapestov slavapestov mentioned this pull request Mar 16, 2018
Closed
@slavapestov slavapestov mentioned this pull request Mar 16, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrose-apple jrose-apple jrose-apple left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@slavapestov @swift-ci @jrose-apple