PR c++/26068

[pf3gnuchains/gcc-fork.git] / gcc / ipa-pure-const.c

diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 1402607..079af5e 100644 (file)
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -16,8 +16,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* This file mark functions as being either const (TREE_READONLY) or
    pure (DECL_IS_PURE).
@@ -182,13 +182,14 @@ check_tree (funct_state local, tree t, bool checking_write)
       
       /* Any indirect reference that occurs on the lhs
         disqualifies the function from being pure or const. Any
-        indirect reference that occurs on the rhs disqualifies
-        the function from being const.  */
-      if (checking_write) 
+        indirect reference to a volatile disqualifies the
+        function from being pure or const.  Any indirect
+        reference that occurs on the rhs disqualifies the
+        function from being const.  */
+      if (checking_write || TREE_THIS_VOLATILE (t)) 
        local->pure_const_state = IPA_NEITHER;
-      else 
-       if (local->pure_const_state == IPA_CONST)
-         local->pure_const_state = IPA_PURE;
+      else if (local->pure_const_state == IPA_CONST)
+       local->pure_const_state = IPA_PURE;
     }
 
   if (SSA_VAR_P (t))
@@ -489,7 +490,7 @@ scan_function (tree *tp,
 static void
 analyze_function (struct cgraph_node *fn)
 {
-  funct_state l = xcalloc (1, sizeof (struct funct_state_d));
+  funct_state l = XCNEW (struct funct_state_d);
   tree decl = fn->decl;
   struct ipa_dfs_info * w_info = fn->aux;
 
@@ -571,13 +572,13 @@ analyze_function (struct cgraph_node *fn)
    on the local information that was produced by ipa_analyze_function
    and ipa_analyze_variable.  */
 
-static void
+static unsigned int
 static_execute (void)
 {
   struct cgraph_node *node;
   struct cgraph_node *w;
   struct cgraph_node **order =
-    xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
+    XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
   int order_pos = order_pos = ipa_utils_reduced_inorder (order, true, false);
   int i;
   struct ipa_dfs_info * w_info;
@@ -694,11 +695,15 @@ static_execute (void)
     /* Get rid of the aux information.  */
     if (node->aux)
       {
+       w_info = node->aux;
+       if (w_info->aux)
+         free (w_info->aux);
        free (node->aux);
        node->aux = NULL;
       }
 
   free (order);
+  return 0;
 }
 
 static bool
@@ -711,7 +716,7 @@ gate_pure_const (void)
 
 struct tree_opt_pass pass_ipa_pure_const =
 {
-  "ipa-pure-const",                    /* name */
+  "pure-const",                                /* name */
   gate_pure_const,                     /* gate */
   static_execute,                      /* execute */
   NULL,                                        /* sub */