diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2e586500a2..66b47081c14 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2004-12-11  Roger Sayle  <roger@eyesopen.com>
+2004-12-12  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* lcm.c (optimize_mode_switching): Free ptr even when mode_set
+	is NULL_RTX.
+
+2004-12-12  Roger Sayle  <roger@eyesopen.com>
 
 	* reg-stack.c (change_stack): Avoid placing the new top-of-stack in
 	its correct location during popping if we need to permute the stack
diff --git a/gcc/lcm.c b/gcc/lcm.c
index 2c4f3fad847..25df2e63cb6 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -1274,17 +1274,17 @@ optimize_mode_switching (FILE *file)
 		  mode_set = get_insns ();
 		  end_sequence ();
 
-		  /* Do not bother to insert empty sequence.  */
-		  if (mode_set == NULL_RTX)
-		    continue;
-
-		  emited = true;
-		  if (NOTE_P (ptr->insn_ptr)
-		      && (NOTE_LINE_NUMBER (ptr->insn_ptr)
-			  == NOTE_INSN_BASIC_BLOCK))
-		    emit_insn_after (mode_set, ptr->insn_ptr);
-		  else
-		    emit_insn_before (mode_set, ptr->insn_ptr);
+		  /* Insert MODE_SET only if it is nonempty.  */
+		  if (mode_set != NULL_RTX)
+		    {
+		      emited = true;
+		      if (NOTE_P (ptr->insn_ptr)
+			  && (NOTE_LINE_NUMBER (ptr->insn_ptr)
+			      == NOTE_INSN_BASIC_BLOCK))
+			emit_insn_after (mode_set, ptr->insn_ptr);
+		      else
+			emit_insn_before (mode_set, ptr->insn_ptr);
+		    }
 		}
 
 	      free (ptr);