From: Nathan Froyd <froydnj@codesourcery.com>
Date: Thu, 14 Apr 2011 18:46:34 +0000 (+0000)
Subject: re PR objc++/48479 (Many ICEs in the obj-c++.dg test suite on *-apple-darwin*)
X-Git-Tag: releases/gcc-4.7.0~7487
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81c1113ac93b0df9ae0c89e6f071d148accee40f;p=thirdparty%2Fgcc.git

re PR objc++/48479 (Many ICEs in the obj-c++.dg test suite on *-apple-darwin*)

	PR objc++/48479
	* typeck.c (cxx_mark_addressable) [CONST_DECL]: Mark addressable
	and return immediately.

From-SVN: r172441
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 86ee781d126c..d2d68ecd2b37 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index b0e211058f2a..89d3247db341 100644
--- 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;