diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c92689892c3..e5050e1248b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR rtl-optimization/47698
+	* ifcvt.c (noce_operand_ok): Move around comment.
+
 2011-11-08  Richard Guenther  <rguenther@suse.de>
 
 	PR lto/50999
@@ -479,7 +484,7 @@
 2011-11-07  Sergey Ostanevich  <sergos.gnu@gmail.com>
 
 	PR rtl-optimization/47698
-	* ifconv.c (noce_operand_ok): prevent CMOV generation for volatile mem.
+	* ifcvt.c (noce_operand_ok): Return false for mems with side effects.
 
 2011-11-07  Tristan Gingold  <gingold@adacore.com>
 
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 3b05c2a8ad87..e8fa0bd0fb99 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -2327,11 +2327,11 @@ noce_get_condition (rtx jump, rtx *earliest, bool then_else_reversed)
 static int
 noce_operand_ok (const_rtx op)
 {
-  /* We special-case memories, so handle any of them with
-     no address side effects.  */
   if (side_effects_p (op))
     return FALSE;
 
+  /* We special-case memories, so handle any of them with
+     no address side effects.  */
   if (MEM_P (op))
     return ! side_effects_p (XEXP (op, 0));