re PR c++/51818 ([C++0x] Name mangling error using lambda expressions in GCC47)

	PR c++/51818
	* mangle.c (find_substitution): A type is only a substitution
	match if we're looking for a type.
	(write_nested_name): Use decl_mangling_context.

From-SVN: r183107

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8893880b2c29c7268415b8fa00b41e272b943bb0..6850778b4d32587f2ec08f21b9e6683c429336e7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2012-01-11  Jason Merrill  <jason@redhat.com>
 
+       PR c++/51818
+       * mangle.c (find_substitution): A type is only a substitution
+       match if we're looking for a type.
+       (write_nested_name): Use decl_mangling_context.
+
        * decl.c (decls_match): Assert that the arguments are decls.
 
        PR c++/51613

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index f4efa67cc2732f7c9a0a42ae7c3b84ddc634a2de..60b187007b17a9d06fc225a34c9209b07b5a4382 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -615,7 +615,7 @@ find_substitution (tree node)
       /* NODE is a matched to a candidate if it's the same decl node or
         if it's the same type.  */
       if (decl == candidate
-         || (TYPE_P (candidate) && type && TYPE_P (type)
+         || (TYPE_P (candidate) && type && TYPE_P (node)
              && same_type_p (type, candidate))
          || NESTED_TEMPLATE_MATCH (node, candidate))
        {
@@ -949,7 +949,7 @@ write_nested_name (const tree decl)
   else
     {
       /* No, just use <prefix>  */
-      write_prefix (CP_DECL_CONTEXT (decl));
+      write_prefix (decl_mangling_context (decl));
       write_unqualified_name (decl);
     }
   write_char ('E');

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f49cdd90ed476b7b192d75f16b87d60c67486efc..0d5b59676299413b896d9d1bed2634cd2dfd8e8c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-11  Jason Merrill  <jason@redhat.com>
+
+       PR c++/51818
+       * g++.dg/cpp0x/lambda/lambda-mangle3.C: New.
+
 2012-01-11  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/array19.ad[sb]: New test.

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C
new file mode 100644 (file)
index 0000000..06913a1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C
@@ -0,0 +1,15 @@
+// PR c++/51818
+// { dg-options -std=c++0x }
+// { dg-final { scan-assembler "_ZN1AC1IN3foo3barMUlvE_EEET_" } }
+
+struct A
+{
+  template <class T> A(T) { }
+};
+
+struct foo
+{
+  A bar = []{};
+};
+
+foo f;