diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-09-12 15:48:15 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-09-12 15:48:15 +0000 |
| commit | f3a762a8de396af471f35b77f6897989867c898e (patch) | |
| tree | bcc9e4f8c93a41990c3536cf614ac955b0b88bc3 | |
| parent | eced60c185c92a34953090b98d8458fb2df9dc81 (diff) | |
Remove the restriction on module-private friends. Since the friend
declaration may be the first declaration, we want the ability to that
declaration to be marked module-private.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139497 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | lib/Sema/DeclSpec.cpp | 7 | ||||
| -rw-r--r-- | test/Modules/module-private.cpp | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 2c8a566719..0f3b998c65 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -582,8 +582,6 @@ 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 531e7a535a..bb483cc9b1 100644 --- a/lib/Sema/DeclSpec.cpp +++ b/lib/Sema/DeclSpec.cpp @@ -899,13 +899,6 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { ClearStorageClassSpecs(); } - // 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. diff --git a/test/Modules/module-private.cpp b/test/Modules/module-private.cpp index 849897f733..4421538622 100644 --- a/test/Modules/module-private.cpp +++ b/test/Modules/module-private.cpp @@ -96,8 +96,8 @@ 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__}} + friend __module_private__ void public_func_friend(); + friend __module_private__ struct public_struct_friend; }; template<> __module_private__ struct public_class<int>::inner_struct { }; // expected-error{{member specialization cannot be declared __module_private__}} |