re PR c++/33486 (namespace association doesn't handle parallel namespaces)

        * gcc/cp/parser.c (cp_parser_declaration): Handle 'inline namespace'.
        (cp_parser_namespace_definition): Likewise.

        PR c++/33486
        * gcc/cp/name-lookup.c (arg_assoc_namespace): Look down into inline
        namespaces, too.

        * libstdc++-v3/include/bits/c++config: Use 'inline namespace'
        instead of strong using.

From-SVN: r132611

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f7fba35225dd1dd0155496266aca3b397466f1e6..3341c1bd48feb7dd7d964873a26714fd6ff3c52f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-24  Jason Merrill  <jason@redhat.com>
+
+       * parser.c (cp_parser_declaration): Handle "inline namespace".
+       (cp_parser_namespace_definition): Likewise.
+
+       PR c++/33486
+       * name-lookup.c (arg_assoc_namespace): Look down into inline 
+       namespaces, too.
+
 2008-02-23  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
        * typeck.c (check_for_casting_away_constness): Use 1 single

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index ded1d2ec421c140b7afcf6976471b27428027099..4a43cfa29eba20fb5d7454cdc2d69e116d0881d0 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4419,6 +4419,13 @@ arg_assoc_namespace (struct arg_lookup *k, tree scope)
     if (arg_assoc_namespace (k, TREE_PURPOSE (value)))
       return true;
 
+  /* Also look down into inline namespaces.  */
+  for (value = DECL_NAMESPACE_USING (scope); value;
+       value = TREE_CHAIN (value))
+    if (is_associated_namespace (scope, TREE_PURPOSE (value)))
+      if (arg_assoc_namespace (k, TREE_PURPOSE (value)))
+       return true;
+
   value = namespace_binding (k->name, scope);
   if (!value)
     return false;

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index a5bd05519b4e8991964b341b143775d11bf2b6aa..cb0059392a7f4b557fb0adaa5afd2ab2b22f9c28 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -7737,6 +7737,10 @@ cp_parser_declaration (cp_parser* parser)
               || token2.type == CPP_OPEN_BRACE
               || token2.keyword == RID_ATTRIBUTE))
     cp_parser_namespace_definition (parser);
+  /* An inline (associated) namespace definition.  */
+  else if (token1.keyword == RID_INLINE
+          && token2.keyword == RID_NAMESPACE)
+    cp_parser_namespace_definition (parser);
   /* Objective-C++ declaration/definition.  */
   else if (c_dialect_objc () && OBJC_IS_AT_KEYWORD (token1.keyword))
     cp_parser_objc_declaration (parser);
@@ -11562,6 +11566,15 @@ cp_parser_namespace_definition (cp_parser* parser)
 {
   tree identifier, attribs;
   bool has_visibility;
+  bool is_inline;
+
+  if (cp_lexer_next_token_is_keyword (parser->lexer, RID_INLINE))
+    {
+      is_inline = true;
+      cp_lexer_consume_token (parser->lexer);
+    }
+  else
+    is_inline = false;
 
   /* Look for the `namespace' keyword.  */
   cp_parser_require_keyword (parser, RID_NAMESPACE, "`namespace'");
@@ -11583,6 +11596,21 @@ cp_parser_namespace_definition (cp_parser* parser)
   /* Start the namespace.  */
   push_namespace (identifier);
 
+  /* "inline namespace" is equivalent to a stub namespace definition
+     followed by a strong using directive.  */
+  if (is_inline)
+    {
+      tree namespace = current_namespace;
+      /* Set up namespace association.  */
+      DECL_NAMESPACE_ASSOCIATIONS (namespace)
+       = tree_cons (CP_DECL_CONTEXT (namespace), NULL_TREE,
+                    DECL_NAMESPACE_ASSOCIATIONS (namespace));
+      /* Import the contents of the inline namespace.  */
+      pop_namespace ();
+      do_using_directive (namespace);
+      push_namespace (identifier);
+    }
+
   has_visibility = handle_namespace_attrs (current_namespace, attribs);
 
   /* Parse the body of the namespace.  */

diff --git a/gcc/testsuite/g++.dg/lookup/strong-using-1.C b/gcc/testsuite/g++.dg/lookup/strong-using-1.C
index a16fd6a50b973b81e50dbec175309326322e5a6b..739dc936e405e8d010cd035f29b9b7b2a576bb18 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/strong-using-1.C
+++ b/gcc/testsuite/g++.dg/lookup/strong-using-1.C
@@ -3,10 +3,9 @@
 // { dg-do compile }
 
 namespace fool {
-  namespace foo {
+  inline namespace foo {
     template <class T> void swap(T, T);
   }
-  using namespace foo __attribute__((strong));
   template <class T> void swap(T);
 }
 

diff --git a/gcc/testsuite/g++.dg/lookup/strong-using-2.C b/gcc/testsuite/g++.dg/lookup/strong-using-2.C
index 21e47cba014b39dffc9353eede793106f40c3304..5c4b425fa8a8a3da3e693bf07ad7fa9500f3018a 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/strong-using-2.C
+++ b/gcc/testsuite/g++.dg/lookup/strong-using-2.C
@@ -3,16 +3,14 @@
 // { dg-do compile }
 
 namespace foo {
-  namespace foo_impl {
+  inline namespace foo_impl {
     class T; // { dg-error "T" "" }
   }
-  using namespace foo_impl __attribute__((strong));
 }
 namespace bar {
-  namespace bar_impl {
+  inline namespace bar_impl {
     class T; // { dg-error "T" "" }
   }
-  using namespace bar_impl __attribute__((strong));
   using namespace foo;
 }
 namespace baz {

diff --git a/gcc/testsuite/g++.dg/lookup/strong-using-3.C b/gcc/testsuite/g++.dg/lookup/strong-using-3.C
index 9b4d3c3ffea0695313f1e9298280a897370c8367..17c50329df0ace5cd66b29e1620d3216cd7b6ce3 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/strong-using-3.C
+++ b/gcc/testsuite/g++.dg/lookup/strong-using-3.C
@@ -3,10 +3,9 @@
 // { dg-do compile }
 
 namespace bar {
-  namespace foo {
+  inline namespace foo {
     template <class T> void f(T, T);
   }
-  using namespace foo __attribute__((strong));
   template <class T> void f(T);
 }
 

diff --git a/gcc/testsuite/g++.dg/lookup/strong-using-5.C b/gcc/testsuite/g++.dg/lookup/strong-using-5.C
new file mode 100644 (file)
index 0000000..789c8e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/strong-using-5.C
@@ -0,0 +1,24 @@
+// PR c++/33486
+
+namespace A
+{
+  inline namespace B
+  {
+    struct T
+    {
+      struct U { };
+      U f();
+    };
+  }
+
+  inline namespace C
+  {
+    void g (T::U);
+  }
+}
+
+int main()
+{
+  A::T t;
+  g(t.f());
+}

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 68ca46a0397840e5cd964723a38dcf3d66e9fdca..a1550cc4e3e807a8084c7db4de7482ddd855a696 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-20  Jason Merrill  <jason@redhat.com>
+
+       * include/bits/c++config: Use 'inline namespace' instead of 
+       strong using.
+
 2008-02-18  Pedro Lamarao <pedro.lamarao@mndfck.org>
 
        * include/std/tuple: Fixes for moveable, non-copyable types.

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index a85f3a524f225f11fb8f1699eee8937b0c1ed4dd..d42cb9feb47170a792cbf4479031efac8ca46409 100644 (file)
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -180,11 +180,8 @@
 namespace std
 { 
   namespace __norm { } 
-  namespace __debug { }
-  namespace __cxx1998 { }
-
-  using namespace __debug __attribute__ ((strong)); 
-  using namespace __cxx1998 __attribute__ ((strong)); 
+  inline namespace __debug { }
+  inline namespace __cxx1998 { }
 }
 #endif
 
@@ -193,11 +190,8 @@ namespace std
 namespace std
 { 
   namespace __norm { } 
-  namespace __parallel { }
-  namespace __cxx1998 { }
-
-  using namespace __parallel __attribute__ ((strong));
-  using namespace __cxx1998 __attribute__ ((strong)); 
+  inline namespace __parallel { }
+  inline namespace __cxx1998 { }
 }
 #endif
 
@@ -205,22 +199,19 @@ namespace std
 #if _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION
 namespace std
 {
-  namespace _6 { }
-  using namespace _6 __attribute__ ((strong));
+  inline namespace _6 { }
 }
 
 namespace __gnu_cxx 
 { 
-  namespace _6 { }
-  using namespace _6 __attribute__ ((strong));
+  inline namespace _6 { }
 }
 
 namespace std
 {
   namespace tr1 
   { 
-    namespace _6 { }
-    using namespace _6 __attribute__ ((strong));
+    inline namespace _6 { }
   }
 }
 #endif
@@ -235,8 +226,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 # define _GLIBCXX_LDBL_NAMESPACE __gnu_cxx_ldbl128::
 # define _GLIBCXX_BEGIN_LDBL_NAMESPACE namespace __gnu_cxx_ldbl128 {
 # define _GLIBCXX_END_LDBL_NAMESPACE }
-  namespace __gnu_cxx_ldbl128 { }
-  using namespace __gnu_cxx_ldbl128 __attribute__((__strong__));
+  inline namespace __gnu_cxx_ldbl128 { }
 #else
 # define _GLIBCXX_LDBL_NAMESPACE
 # define _GLIBCXX_BEGIN_LDBL_NAMESPACE