re PR c++/65209 (Broken code with global static variables, invalid pointer when freei...

	PR c++/65209
	PR c++/65309
	* decl2.c (constrain_visibility_for_template): Handle reference
	arguments.

From-SVN: r221192

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 44f5c0d746d6c6166ec44a7a2c73537dcedd73e9..bdea7d5737e48112300a57c9ac5597abe4ed49d5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-04  Jason Merrill  <jason@redhat.com>
+
+       PR c++/65209
+       PR c++/65309
+       * decl2.c (constrain_visibility_for_template): Handle reference
+       arguments.
+
 2015-02-25  Jason Merrill  <jason@redhat.com>
 
        PR c++/62255

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 78c1124e277be4c9ab735303169a55053742d445..808c94f271549751a25b88d7afd132c8fad92657 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2122,9 +2122,12 @@ constrain_visibility_for_template (tree decl, tree targs)
       tree arg = TREE_VEC_ELT (args, i-1);
       if (TYPE_P (arg))
        vis = type_visibility (arg);
-      else if (TREE_TYPE (arg) && POINTER_TYPE_P (TREE_TYPE (arg)))
+      else
        {
-         STRIP_NOPS (arg);
+         if (REFERENCE_REF_P (arg))
+           arg = TREE_OPERAND (arg, 0);
+         if (TREE_TYPE (arg))
+           STRIP_NOPS (arg);
          if (TREE_CODE (arg) == ADDR_EXPR)
            arg = TREE_OPERAND (arg, 0);
          if (VAR_OR_FUNCTION_DECL_P (arg))

diff --git a/gcc/testsuite/g++.dg/abi/anon4.C b/gcc/testsuite/g++.dg/abi/anon4.C
new file mode 100644 (file)
index 0000000..088ba99
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/anon4.C
@@ -0,0 +1,41 @@
+// PR c++/65209
+// { dg-final { scan-assembler-not "comdat" } }
+
+// Everything involving the anonymous namespace bits should be private, not
+// COMDAT.
+
+struct Bar
+{
+  static Bar *self();
+  char pad[24];
+};
+
+template <Bar *(&holderFunction)()>
+struct BarGlobalStatic
+{
+  Bar *operator()() { return holderFunction(); }
+};
+
+namespace {
+  namespace Q_QGS_s_self {
+    inline Bar *innerFunction() {
+      static struct Holder {
+       Bar value;
+       ~Holder() {}
+      } holder;
+      return &holder.value;
+    }
+  }
+}
+static BarGlobalStatic<Q_QGS_s_self::innerFunction> s_self;
+
+Bar *Bar::self()
+{
+  return s_self();
+}
+
+int main(int argc, char *argv[])
+{
+  Bar* bar = Bar::self();
+  return 0;
+}