diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6132e3623d2..6e63793ee7b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,7 @@
-2005-11-18  Richard Kenner  <kenner@don.gnat.com>
+2005-11-18  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* expr.c (expand_expr_real): Don't look at EXPR_HAS_LOCATION unless
+	ib_boundaries_block is non-null
 
 	* postreload.c (reload_cse_move2add): Don't try to work with BImode.
 
diff --git a/gcc/expr.c b/gcc/expr.c
index 125e37071d9..13dd782588e 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -6488,7 +6488,7 @@ expand_expr_real (tree exp, rtx target, enum machine_mode tmode,
      information.  It would be better of the diagnostic routines
      used the file/line information embedded in the tree nodes rather
      than globals.  */
-  if (cfun && EXPR_HAS_LOCATION (exp))
+  if (cfun && cfun->ib_boundaries_block && EXPR_HAS_LOCATION (exp))
     {
       location_t saved_location = input_location;
       input_location = EXPR_LOCATION (exp);