From 334cc82d44775325475752b1126a3257b51b2b0c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 15 Apr 2009 21:55:04 +0000
Subject: gdb 	* c-lang.c (evaluate_subexp_c): Correctly handle EVAL_SKIP.
 gdb/testsuite 	* gdb.base/charset.exp: Add regression test.

---
 gdb/c-lang.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gdb/c-lang.c')

diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index e18f173..86de933 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -941,7 +941,15 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
 	*pos += 2;
 
 	if (noside == EVAL_SKIP)
-	  return NULL;
+	  {
+	    /* Return a dummy value of the appropriate type.  */
+	    if ((dest_type & C_CHAR) != 0)
+	      result = allocate_value (type);
+	    else
+	      result = value_typed_string ("", 0, type);
+	    do_cleanups (cleanup);
+	    return result;
+	  }
 
 	if ((dest_type & C_CHAR) != 0)
 	  {
-- 
cgit v1.1