maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Downgrade the error about re-opening an inline namespace as non-inline 

to a warning, since apparently libstdc++'s debug mode does this (and
we can recover safely). Add a Fix-It to insert the "inline", just for kicks.

llvm-svn: 131732
This commit is contained in:
Douglas Gregor 2011-05-20 15:48:31 +00:00
parent 4385d8b0a2
commit a912197fff
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -502,6 +502,8 @@ def err_static_assert_expression_is_not_constant : Error<
"static_assert expression is not an integral constant expression">;
def err_static_assert_failed : Error<"static_assert failed \"%0\"">;
def warn_inline_namespace_reopened_noninline : Warning<
"inline namespace cannot be re-opened as a non-inline namespace">;
def err_inline_namespace_mismatch : Error<
"%select{|non-}0inline namespace "
"cannot be reopened as %select{non-|}0inline">;

14
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -4657,10 +4657,18 @@ Decl *Sema::ActOnStartNamespaceDef(Scope *NamespcScope,
// This is an extended namespace definition.
if (Namespc->isInline() != OrigNS->isInline()) {
// inline-ness must match
Diag(Namespc->getLocation(), diag::err_inline_namespace_mismatch)
<< Namespc->isInline();
if (OrigNS->isInline()) {
// The user probably just forgot the 'inline', so suggest that it
// be added back.
Diag(Namespc->getLocation(),
diag::warn_inline_namespace_reopened_noninline)
<< FixItHint::CreateInsertion(NamespaceLoc, "inline ");
} else {
Diag(Namespc->getLocation(), diag::err_inline_namespace_mismatch)
<< Namespc->isInline();
}
Diag(OrigNS->getLocation(), diag::note_previous_definition);
Namespc->setInvalidDecl();
// Recover by ignoring the new namespace's inline status.
Namespc->setInline(OrigNS->isInline());
}

2
clang/test/CXX/dcl.dcl/basic.namespace/namespace.def/p7.cpp
View File

@ -3,7 +3,7 @@
namespace NIL {} // expected-note {{previous definition}}
inline namespace NIL {} // expected-error {{cannot be reopened as inline}}
inline namespace IL {} // expected-note {{previous definition}}
namespace IL {} // expected-error {{cannot be reopened as non-inline}}
namespace IL {} // expected-warning{{inline namespace cannot be re-opened as a non-inline namespace}}
namespace {} // expected-note {{previous definition}}
inline namespace {} // expected-error {{cannot be reopened as inline}}