From: Richard Henderson <rth@redhat.com>
Date: Thu, 20 Jun 2002 23:25:11 +0000 (-0700)
Subject: typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early.
X-Git-Tag: releases/gcc-3.1.1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c883fe8951226c1587e4fcc23f1da7aa981b25c5;p=thirdparty%2Fgcc.git

typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early.

        * typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early.
        Call put_var_into_stack.
	* g++.dg/opt/asm1.C: New.

From-SVN: r54864
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3de4f8bdb756..4ae454e494ed 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-20  Richard Henderson  <rth@redhat.com>
+
+	PR c++/6747
+	* typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early.
+	Call put_var_into_stack.
+
 2002-06-20  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
 	PR c++/6892
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index fc372361aad3..f3ba665aa575 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4806,9 +4806,6 @@ mark_addressable (exp)
 {
   register tree x = exp;
 
-  if (TREE_ADDRESSABLE (x) == 1)
-    return 1;
-
   while (1)
     switch (TREE_CODE (x))
       {
@@ -4827,6 +4824,8 @@ mark_addressable (exp)
 	    TREE_ADDRESSABLE (x) = 1; /* so compiler doesn't die later */
 	    return 1;
 	  }
+	/* FALLTHRU */
+
       case VAR_DECL:
 	/* Caller should not be trying to mark initialized
 	   constant fields addressable.  */
@@ -4834,6 +4833,7 @@ mark_addressable (exp)
 			    || DECL_IN_AGGR_P (x) == 0
 			    || TREE_STATIC (x)
 			    || DECL_EXTERNAL (x), 314);
+	/* FALLTHRU */
 
       case CONST_DECL:
       case RESULT_DECL:
@@ -4842,6 +4842,7 @@ mark_addressable (exp)
 	  warning ("address requested for `%D', which is declared `register'",
 		      x);
 	TREE_ADDRESSABLE (x) = 1;
+	put_var_into_stack (x);
 	return 1;
 
       case FUNCTION_DECL: