gdb/

[platform/upstream/binutils.git] / gdb / valops.c

diff --git a/gdb/valops.c b/gdb/valops.c
index f5458ef..ee05d73 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -860,7 +860,7 @@ value_zero (struct type *type, enum lval_type lv)
 {
   struct value *val = allocate_value (type);
 
-  VALUE_LVAL (val) = lv;
+  VALUE_LVAL (val) = (lv == lval_computed ? not_lval : lv);
   return val;
 }
 
@@ -1377,7 +1377,7 @@ value_assign (struct value *toval, struct value *fromval)
 
     case lval_computed:
       {
-       struct lval_funcs *funcs = value_computed_funcs (toval);
+       const struct lval_funcs *funcs = value_computed_funcs (toval);
 
        funcs->write (toval, fromval);
       }
@@ -1740,7 +1740,7 @@ value_ind (struct value *arg1)
 
   if (VALUE_LVAL (arg1) == lval_computed)
     {
-      struct lval_funcs *funcs = value_computed_funcs (arg1);
+      const struct lval_funcs *funcs = value_computed_funcs (arg1);
 
       if (funcs->indirect)
        {
@@ -2585,6 +2585,7 @@ find_overload_match (struct type **arg_types, int nargs,
          if (*valp)
            {
              *staticp = 1;
+             do_cleanups (all_cleanups);
              return 0;
            }
        }
@@ -2670,6 +2671,7 @@ find_overload_match (struct type **arg_types, int nargs,
       if (func_name == NULL)
         {
          *symp = fsym;
+         do_cleanups (all_cleanups);
           return 0;
         }