c++: attribute on dtor in template [PR108795]

Since r7-2549 we were throwing away the explicit C:: when we found that ~C
has an attribute that we treat as making its type dependent.

	PR c++/108795

gcc/cp/ChangeLog:

	* semantics.cc (finish_id_expression_1): Check scope before
	returning id_expression.

gcc/testsuite/ChangeLog:

	* g++.dg/ext/attr-tsafe1.C: New test.

diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index ae6cf71b4f59d4e93cfae22b8d06123c6390ab5a..ee0db331f34cfbe017552e5cb61694f53cdb9bdb 100644 (file)
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -4152,6 +4152,7 @@ finish_id_expression_1 (tree id_expression,
                    : CP_ID_KIND_UNQUALIFIED)));
 
       if (dependent_p
+         && !scope
          && DECL_P (decl)
          && any_dependent_type_attributes_p (DECL_ATTRIBUTES (decl)))
        /* Dependent type attributes on the decl mean that the TREE_TYPE is

diff --git a/gcc/testsuite/g++.dg/ext/attr-tsafe1.C b/gcc/testsuite/g++.dg/ext/attr-tsafe1.C
new file mode 100644 (file)
index 0000000..20c319f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-tsafe1.C
@@ -0,0 +1,14 @@
+// PR c++/108795
+
+template <typename T> void g (T x)
+{
+  struct C
+  {
+    __attribute__((transaction_safe)) ~C();
+  };
+  C::~C();                     // { dg-error "" }
+}
+void f ()
+{
+  g (5);
+}