diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2643c29516..cc3117c92da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-26  Josh Conner  <jconner@apple.com>
+
+	PR middle-end/23584
+	* ipa-pure-const.c (check_tree): Check for volatile-ness
+	when considering a dereference.
+
 2005-08-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* rtl.h (MEM_IN_STRUCT_P): Fix comment typo.
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 0b659a0aee6..c60383118f2 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -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))