diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | lib/Sema/DeclSpec.cpp | 9 | ||||
| -rw-r--r-- | test/Modules/module-private.cpp | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 0f3b998c65..2c8a566719 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -582,6 +582,8 @@ def err_module_expected_ident : Error< "expected a module name after '__import_module__'">; def err_module_expected_semi : Error< "expected a semicolon name after module name">; +def err_module_private_friend : Error< + "friend cannot be declared __module_private__">; } } // end of Parser diagnostics diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp index 55964d5006..531e7a535a 100644 --- a/lib/Sema/DeclSpec.cpp +++ b/lib/Sema/DeclSpec.cpp @@ -899,8 +899,15 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { ClearStorageClassSpecs(); } - assert(!TypeSpecOwned || isDeclRep((TST) TypeSpecType)); + // A friend cannot be specified as module-private. + if (isFriendSpecified() && isModulePrivateSpecified()) { + Diag(D, ModulePrivateLoc, diag::err_module_private_friend) + << FixItHint::CreateRemoval(ModulePrivateLoc); + ModulePrivateLoc = SourceLocation(); + } + assert(!TypeSpecOwned || isDeclRep((TST) TypeSpecType)); + // Okay, now we can infer the real type. // TODO: return "auto function" and other bad things based on the real type. diff --git a/test/Modules/module-private.cpp b/test/Modules/module-private.cpp index 0f1d5923dc..849897f733 100644 --- a/test/Modules/module-private.cpp +++ b/test/Modules/module-private.cpp @@ -95,6 +95,9 @@ template<typename T> struct public_class { struct inner_struct; static int static_var; + + friend __module_private__ void public_func(); // expected-error{{friend cannot be declared __module_private__}} + friend __module_private__ struct public_struct; // expected-error{{friend cannot be declared __module_private__}} }; template<> __module_private__ struct public_class<int>::inner_struct { }; // expected-error{{member specialization cannot be declared __module_private__}} |