diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bcb1a1d8d2b..b3790b80c5a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-24  Jim Blandy  <jimb@codesourcery.com>
+
+	* dwarf2loc.c (dwarf2_evaluate_loc_desc): When the location
+	expression is empty, bother to return the 'optimized out' value we
+	construct.  (Thanks to Carl Burch.)
+
 2007-01-24  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* varobj.c (c_value_of_root, c_value_of_child)
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 684a9bc22fc..a179566cfa5 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -201,6 +201,7 @@ dwarf2_evaluate_loc_desc (struct symbol *var, struct frame_info *frame,
       retval = allocate_value (SYMBOL_TYPE (var));
       VALUE_LVAL (retval) = not_lval;
       set_value_optimized_out (retval, 1);
+      return retval;
     }
 
   baton.frame = frame;