[PATCH] D111860: [modules] Update visibility for merged ObjCProtocolDecl definitions.
vsapsai added a comment. Thanks for the review! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D111860/new/ https://reviews.llvm.org/D111860 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D111860: [modules] Update visibility for merged ObjCProtocolDecl definitions.
This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG7ad693a322c1: [modules] Update visibility for merged ObjCProtocolDecl definitions. (authored by vsapsai). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D111860/new/ https://reviews.llvm.org/D111860 Files: clang/lib/Serialization/ASTReaderDecl.cpp clang/test/Modules/merge-objc-protocol-visibility.m Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/RegularHider.framework/Modules/module.modulemap +framework module RegularHider { + header "Visible.h" + export * + + explicit module Hidden { +header "Hidden.h" +export * + } +} + +//--- test.m +#import + +#if HIDDEN_FIRST +#import +#import +#else +#import +#import +#endif + +void test(Common *obj) { + [[obj getProtocolObj] protocolMethod]; +} Index: clang/lib/Serialization/ASTReaderDecl.cpp === --- clang/lib/Serialization/ASTReaderDecl.cpp +++ clang/lib/Serialization/ASTReaderDecl.cpp @@ -1250,6 +1250,13 @@ void ASTDeclReader::MergeDefinitionData(ObjCProtocolDecl *D, struct ObjCProtocolDecl::DefinitionData &) { + struct ObjCProtocolDecl::DefinitionData = D->data(); + if (DD.Definition != NewDD.Definition) { +Reader.MergedDeclContexts.insert( +std::make_pair(NewDD.Definition, DD.Definition)); +Reader.mergeDefinitionVisibility(DD.Definition, NewDD.Definition); + } + // FIXME: odr checking? } Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod; +@end + +//---
[PATCH] D111860: [modules] Update visibility for merged ObjCProtocolDecl definitions.
Bigcheese accepted this revision. Bigcheese added a comment. This revision is now accepted and ready to land. lgtm Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D111860/new/ https://reviews.llvm.org/D111860 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D111860: [modules] Update visibility for merged ObjCProtocolDecl definitions.
vsapsai updated this revision to Diff 383201. vsapsai added a comment. Rebase and trigger pre-merge checks again. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D111860/new/ https://reviews.llvm.org/D111860 Files: clang/lib/Serialization/ASTReaderDecl.cpp clang/test/Modules/merge-objc-protocol-visibility.m Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/RegularHider.framework/Modules/module.modulemap +framework module RegularHider { + header "Visible.h" + export * + + explicit module Hidden { +header "Hidden.h" +export * + } +} + +//--- test.m +#import + +#if HIDDEN_FIRST +#import +#import +#else +#import +#import +#endif + +void test(Common *obj) { + [[obj getProtocolObj] protocolMethod]; +} Index: clang/lib/Serialization/ASTReaderDecl.cpp === --- clang/lib/Serialization/ASTReaderDecl.cpp +++ clang/lib/Serialization/ASTReaderDecl.cpp @@ -1250,6 +1250,13 @@ void ASTDeclReader::MergeDefinitionData(ObjCProtocolDecl *D, struct ObjCProtocolDecl::DefinitionData &) { + struct ObjCProtocolDecl::DefinitionData = D->data(); + if (DD.Definition != NewDD.Definition) { +Reader.MergedDeclContexts.insert( +std::make_pair(NewDD.Definition, DD.Definition)); +Reader.mergeDefinitionVisibility(DD.Definition, NewDD.Definition); + } + // FIXME: odr checking? } Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/RegularHider.framework/Modules/module.modulemap +framework module RegularHider { + header "Visible.h" + export * + + explicit module Hidden { +
[PATCH] D111860: [modules] Update visibility for merged ObjCProtocolDecl definitions.
vsapsai created this revision. vsapsai added reviewers: Bigcheese, bnbarham. Herald added a subscriber: ributzka. vsapsai requested review of this revision. Herald added a project: clang. Add a test that shows a warning is emitted when we cannot find a visible protocol and merge definition visibility the same way we do for other decls. rdar://83600696 Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D111860 Files: clang/lib/Serialization/ASTReaderDecl.cpp clang/test/Modules/merge-objc-protocol-visibility.m Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/RegularHider.framework/Modules/module.modulemap +framework module RegularHider { + header "Visible.h" + export * + + explicit module Hidden { +header "Hidden.h" +export * + } +} + +//--- test.m +#import + +#if HIDDEN_FIRST +#import +#import +#else +#import +#import +#endif + +void test(Common *obj) { + [[obj getProtocolObj] protocolMethod]; +} Index: clang/lib/Serialization/ASTReaderDecl.cpp === --- clang/lib/Serialization/ASTReaderDecl.cpp +++ clang/lib/Serialization/ASTReaderDecl.cpp @@ -1243,6 +1243,13 @@ void ASTDeclReader::MergeDefinitionData(ObjCProtocolDecl *D, struct ObjCProtocolDecl::DefinitionData &) { + struct ObjCProtocolDecl::DefinitionData = D->data(); + if (DD.Definition != NewDD.Definition) { +Reader.MergedDeclContexts.insert( +std::make_pair(NewDD.Definition, DD.Definition)); +Reader.mergeDefinitionVisibility(DD.Definition, NewDD.Definition); + } + // FIXME: odr checking? } Index: clang/test/Modules/merge-objc-protocol-visibility.m === --- /dev/null +++ clang/test/Modules/merge-objc-protocol-visibility.m @@ -0,0 +1,76 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=1 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache +// RUN: %clang_cc1 -emit-llvm -o %t/test.bc -F%t/Frameworks %t/test.m -Werror=objc-method-access -DHIDDEN_FIRST=0 \ +// RUN:-fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache + +// Test a case when Objective-C protocol is imported both as hidden and as visible. + +//--- Frameworks/Foundation.framework/Headers/Foundation.h +@interface NSObject +@end + +//--- Frameworks/Foundation.framework/Modules/module.modulemap +framework module Foundation { + header "Foundation.h" + export * +} + +//--- Frameworks/Common.framework/Headers/Common.h +#import +@protocol Testing; +@interface Common : NSObject +- (id)getProtocolObj; +@end + +//--- Frameworks/Common.framework/Modules/module.modulemap +framework module Common { + header "Common.h" + export * +} + +//--- Frameworks/Regular.framework/Headers/Regular.h +@protocol Testing +- (void)protocolMethod; +@end + +//--- Frameworks/Regular.framework/Modules/module.modulemap +framework module Regular { + header "Regular.h" + export * +} + +//--- Frameworks/RegularHider.framework/Headers/Visible.h +// Empty, file required to create a module. + +//--- Frameworks/RegularHider.framework/Headers/Hidden.h +@protocol Testing +- (void)protocolMethod;