aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-10-20 02:49:13 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-10-20 02:49:13 -0400
commit0d8ab59ce04e7df40bf505c7e341599b141e98c4 (patch)
tree3a7b296e2e2611189857913cc24ab29633d02d21 /gcc
parent620cf5ea84a3da4730462b553c5e3c17e39d8ed9 (diff)
downloadgcc-0d8ab59ce04e7df40bf505c7e341599b141e98c4.zip
gcc-0d8ab59ce04e7df40bf505c7e341599b141e98c4.tar.gz
gcc-0d8ab59ce04e7df40bf505c7e341599b141e98c4.tar.bz2
re PR c++/67064 (Register asm variable broken)
PR c++/67064 * semantics.c (force_paren_expr): Don't mess with hard register vars. From-SVN: r229021
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/semantics.c2
-rw-r--r--gcc/testsuite/g++.dg/parse/parens3.C18
3 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 842426b..6ffa733 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2015-10-19 Jason Merrill <jason@redhat.com>
+ PR c++/67064
+ * semantics.c (force_paren_expr): Don't mess with hard register vars.
+
Implement N4268, Do constant evaluation of all non-type template args.
* parser.c (cp_parser_template_argument): For C++1z just parse a
constant-expression.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 8796b17..c0a8b32 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1660,6 +1660,8 @@ force_paren_expr (tree expr)
REF_PARENTHESIZED_P (expr) = true;
else if (type_dependent_expression_p (expr))
expr = build1 (PAREN_EXPR, TREE_TYPE (expr), expr);
+ else if (VAR_P (expr) && DECL_HARD_REGISTER (expr))
+ /* We can't bind a hard register variable to a reference. */;
else
{
cp_lvalue_kind kind = lvalue_kind (expr);
diff --git a/gcc/testsuite/g++.dg/parse/parens3.C b/gcc/testsuite/g++.dg/parse/parens3.C
new file mode 100644
index 0000000..afb392b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/parens3.C
@@ -0,0 +1,18 @@
+// PR c++/67064
+// { dg-options "-w" }
+
+struct s {
+ int i;
+};
+
+register struct s *reg __asm__( "1" );
+
+int f(void)
+{
+ int i;
+
+ i = reg->i;
+ i = (reg)->i;
+
+ return i;
+}