Fix errors and warnings building swift/PrintAsObjc on Windows using MSVC #6030
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CodaFi
reviewed
Dec 2, 2016
| @@ -821,7 +819,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>, | |||
| break; | |||
| case NullabilityPrintKind::After: | |||
| os << ' '; | |||
| [[clang::fallthrough]]; | |||
| LLVM_FALLTHROUGH | |||
There was a problem hiding this comment.
This should still have a semicolon after it.
There was a problem hiding this comment.
Good spot - its empty on MSVC so never thought of that
jrose-apple
reviewed
Dec 2, 2016
| @@ -1536,7 +1534,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>, | |||
| } | |||
| }; | |||
|
|
|||
| class ReferencedTypeFinder : private TypeVisitor<ReferencedTypeFinder> { | |||
| class ReferencedTypeFinder : public TypeVisitor<ReferencedTypeFinder> { | |||
There was a problem hiding this comment.
Why does this need to be public?
There was a problem hiding this comment.
We get the following error:
1>C:\Users\hbellamy\Documents\GitHub\my-swift\swift\lib\PrintAsObjC\PrintAsObjC.cpp(1907): error C2247: 'swift::TypeVisitor<`anonymous-namespace'::ReferencedTypeFinder,void>::visit' not accessible because '`anonymous-namespace'::ReferencedTypeFinder' uses 'private' to inherit from 'swift::TypeVisitor<`anonymous-namespace'::ReferencedTypeFinder,void>'
1> C:\Users\hbellamy\Documents\GitHub\my-swift\swift\include\swift/AST/TypeVisitor.h(30): note: see declaration of 'swift::TypeVisitor<`anonymous-namespace'::ReferencedTypeFinder,void>::visit'
1> C:\Users\hbellamy\Documents\GitHub\my-swift\swift\lib\PrintAsObjC\PrintAsObjC.cpp(1539): note: see declaration of '`anonymous-namespace'::ReferencedTypeFinder'
1> C:\Users\hbellamy\Documents\GitHub\my-swift\swift\lib\PrintAsObjC\PrintAsObjC.cpp(1539): note: see declaration of 'swift::TypeVisitor<`anonymous-namespace'::ReferencedTypeFinder,void>'
There was a problem hiding this comment.
I was going to say "why not just redeclare the visit method" but I guess it doesn't matter; these are all local helper types anyway.
jrose-apple
approved these changes
Dec 2, 2016
|
@swift-ci Please smoke test and merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
using ASTVisitor::visitas MSVC considers it to be ambiguous:[[clang::fallthrough]]by replacing it withLLVM_FALLTHROUGHReferencedTypeFinderpublically inherit fromTypeVisitordue to the following error: