re PR c++/60955 (Erroneous warning about taking address of register with std=c++1y)

/cp
2014-12-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60955
	* pt.c (struct warning_sentinel): Move it...
	* cp-tree.h: ... here.
	* semantics.c (force_paren_expr): Use it.

/testsuite
2014-12-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60955
	* g++.dg/warn/register-parm-1.C: New.

From-SVN: r218871

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e7e2365353e07269572aa8ef18627728727215ce..e22b516ae7509a92126159b22d819396f78477b5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/60955
+       * pt.c (struct warning_sentinel): Move it...
+       * cp-tree.h: ... here.
+       * semantics.c (force_paren_expr): Use it.
+
 2014-12-17  Jason Merrill  <jason@redhat.com>
 
        PR c++/64333

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e0e7690b1889c99d1a46e73a734db9848b4d697e..9487e503ae136bae0371adc1a1eb18b0822ac28f 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1149,6 +1149,18 @@ struct processing_template_decl_sentinel
   }
 };
 
+/* RAII sentinel to disable certain warnings during template substitution
+   and elsewhere.  */
+
+struct warning_sentinel
+{
+  int &flag;
+  int val;
+  warning_sentinel(int& flag, bool suppress=true)
+    : flag(flag), val(flag) { if (suppress) flag = 0; }
+  ~warning_sentinel() { flag = val; }
+};
+
 /* The cached class binding level, from the most recently exited
    class, or NULL if none.  */
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8a663d98c4727946e0c3354598584167f9f816aa..9f036846f58c02ce292e738aa5e76a89b46d8b14 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14438,16 +14438,6 @@ tsubst_non_call_postfix_expression (tree t, tree args,
   return t;
 }
 
-/* Sentinel to disable certain warnings during template substitution.  */
-
-struct warning_sentinel {
-  int &flag;
-  int val;
-  warning_sentinel(int& flag, bool suppress=true)
-    : flag(flag), val(flag) { if (suppress) flag = 0; }
-  ~warning_sentinel() { flag = val; }
-};
-
 /* Like tsubst but deals with expressions and performs semantic
    analysis.  FUNCTION_P is true if T is the "F" in "F (ARGS)".  */
 

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 5ad391eda5beeedc42e16f5b51566152d93d215e..bea3b1fbe68288764521caf2a42b07ad01d4e187 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1660,6 +1660,9 @@ force_paren_expr (tree expr)
          tree type = unlowered_expr_type (expr);
          bool rval = !!(kind & clk_rvalueref);
          type = cp_build_reference_type (type, rval);
+         /* This inhibits warnings in, eg, cxx_mark_addressable
+            (c++/60955).  */
+         warning_sentinel s (extra_warnings);
          expr = build_static_cast (type, expr, tf_error);
          if (expr != error_mark_node)
            REF_PARENTHESIZED_P (expr) = true;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4d75d0e04b20e0d674a38b69b9daa59161df9900..5ad3d9ab82d91d2359374ee1c10ca5e48930f054 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/60955
+       * g++.dg/warn/register-parm-1.C: New.
+
 2014-12-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gcc.target/i386/amd64-abi-7.c: New tests.

diff --git a/gcc/testsuite/g++.dg/warn/register-parm-1.C b/gcc/testsuite/g++.dg/warn/register-parm-1.C
new file mode 100644 (file)
index 0000000..44232d3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/register-parm-1.C
@@ -0,0 +1,9 @@
+// PR c++/60955
+// { dg-options "-Wextra" }
+
+unsigned int erroneous_warning(register int a) {
+    if ((a) & 0xff) return 1; else return 0;
+}
+unsigned int no_erroneous_warning(register int a) {
+    if (a & 0xff) return 1; else return 0;
+}