PR objc++/48479

	* typeck.c (cxx_mark_addressable) [CONST_DECL]: Mark addressable
	and return immediately.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172441 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 86ee781..d2d68ec 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-14  Nathan Froyd  <froydnj@codesourcery.com>
 
+       PR objc++/48479
+       * typeck.c (cxx_mark_addressable) [CONST_DECL]: Mark addressable
+       and return immediately.
+
+2011-04-14  Nathan Froyd  <froydnj@codesourcery.com>
+
        * cp-tree.def (SWITCH_STMT): Add an extra operand.
        * cp-objcp-common.c (cp_common_init_ts): Mark it as TS_TYPED.
        * cp-tree.h (SWITCH_STMT_SCOPE): Define.

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index b0e2110..89d3247 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5373,7 +5373,6 @@ cxx_mark_addressable (tree exp)
                    || DECL_EXTERNAL (x));
        /* Fall through.  */
 
-      case CONST_DECL:
       case RESULT_DECL:
        if (DECL_REGISTER (x) && !TREE_ADDRESSABLE (x)
            && !DECL_ARTIFICIAL (x))
@@ -5391,6 +5390,7 @@ cxx_mark_addressable (tree exp)
        TREE_ADDRESSABLE (x) = 1;
        return true;
 
+      case CONST_DECL:
       case FUNCTION_DECL:
        TREE_ADDRESSABLE (x) = 1;
        return true;