Automatic date update in version.in

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

diff --git a/gdb/valops.c b/gdb/valops.c
index 4164d63..7f3e4f5 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -36,12 +36,8 @@
 #include "cp-support.h"
 #include "dfp.h"
 #include "tracepoint.h"
-#include <errno.h>
-#include <string.h>
-#include "gdb_assert.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "extension.h"
 
 extern unsigned int overload_debug;
@@ -1115,52 +1111,54 @@ value_assign (struct value *toval, struct value *fromval)
          error (_("Value being assigned to is no longer active."));
 
        gdbarch = get_frame_arch (frame);
-       if (gdbarch_convert_register_p (gdbarch, VALUE_REGNUM (toval), type))
+
+       if (value_bitsize (toval))
          {
-           /* If TOVAL is a special machine register requiring
-              conversion of program values to a special raw
-              format.  */
-           gdbarch_value_to_register (gdbarch, frame,
-                                      VALUE_REGNUM (toval), type,
-                                      value_contents (fromval));
+           struct value *parent = value_parent (toval);
+           int offset = value_offset (parent) + value_offset (toval);
+           int changed_len;
+           gdb_byte buffer[sizeof (LONGEST)];
+           int optim, unavail;
+
+           changed_len = (value_bitpos (toval)
+                          + value_bitsize (toval)
+                          + HOST_CHAR_BIT - 1)
+                         / HOST_CHAR_BIT;
+
+           if (changed_len > (int) sizeof (LONGEST))
+             error (_("Can't handle bitfields which "
+                      "don't fit in a %d bit word."),
+                    (int) sizeof (LONGEST) * HOST_CHAR_BIT);
+
+           if (!get_frame_register_bytes (frame, value_reg, offset,
+                                          changed_len, buffer,
+                                          &optim, &unavail))
+             {
+               if (optim)
+                 throw_error (OPTIMIZED_OUT_ERROR,
+                              _("value has been optimized out"));
+               if (unavail)
+                 throw_error (NOT_AVAILABLE_ERROR,
+                              _("value is not available"));
+             }
+
+           modify_field (type, buffer, value_as_long (fromval),
+                         value_bitpos (toval), value_bitsize (toval));
+
+           put_frame_register_bytes (frame, value_reg, offset,
+                                     changed_len, buffer);
          }
        else
          {
-           if (value_bitsize (toval))
+           if (gdbarch_convert_register_p (gdbarch, VALUE_REGNUM (toval),
+                                           type))
              {
-               struct value *parent = value_parent (toval);
-               int offset = value_offset (parent) + value_offset (toval);
-               int changed_len;
-               gdb_byte buffer[sizeof (LONGEST)];
-               int optim, unavail;
-
-               changed_len = (value_bitpos (toval)
-                              + value_bitsize (toval)
-                              + HOST_CHAR_BIT - 1)
-                 / HOST_CHAR_BIT;
-
-               if (changed_len > (int) sizeof (LONGEST))
-                 error (_("Can't handle bitfields which "
-                          "don't fit in a %d bit word."),
-                        (int) sizeof (LONGEST) * HOST_CHAR_BIT);
-
-               if (!get_frame_register_bytes (frame, value_reg, offset,
-                                              changed_len, buffer,
-                                              &optim, &unavail))
-                 {
-                   if (optim)
-                     throw_error (OPTIMIZED_OUT_ERROR,
-                                  _("value has been optimized out"));
-                   if (unavail)
-                     throw_error (NOT_AVAILABLE_ERROR,
-                                  _("value is not available"));
-                 }
-
-               modify_field (type, buffer, value_as_long (fromval),
-                             value_bitpos (toval), value_bitsize (toval));
-
-               put_frame_register_bytes (frame, value_reg, offset,
-                                         changed_len, buffer);
+               /* If TOVAL is a special machine register requiring
+                  conversion of program values to a special raw
+                  format.  */
+               gdbarch_value_to_register (gdbarch, frame,
+                                          VALUE_REGNUM (toval), type,
+                                          value_contents (fromval));
              }
            else
              {
@@ -2452,6 +2450,12 @@ value_find_oload_method_list (struct value **argp, const char *method,
    ADL overload candidates when performing overload resolution for a fully
    qualified name.
 
+   If NOSIDE is EVAL_AVOID_SIDE_EFFECTS, then OBJP's memory cannot be
+   read while picking the best overload match (it may be all zeroes and thus
+   not have a vtable pointer), in which case skip virtual function lookup.
+   This is ok as typically EVAL_AVOID_SIDE_EFFECTS is only used to determine
+   the result type.
+
    Note: This function does *not* check the value of
    overload_resolution.  Caller must check it to see whether overload
    resolution is permitted.  */
@@ -2461,7 +2465,8 @@ find_overload_match (struct value **args, int nargs,
                     const char *name, enum oload_search_type method,
                     struct value **objp, struct symbol *fsym,
                     struct value **valp, struct symbol **symp, 
-                    int *staticp, const int no_adl)
+                    int *staticp, const int no_adl,
+                    const enum noside noside)
 {
   struct value *obj = (objp ? *objp : NULL);
   struct type *obj_type = obj ? value_type (obj) : NULL;
@@ -2767,9 +2772,13 @@ find_overload_match (struct value **args, int nargs,
     {
       if (src_method_oload_champ >= 0)
        {
-         if (TYPE_FN_FIELD_VIRTUAL_P (fns_ptr, method_oload_champ))
-           *valp = value_virtual_fn_field (&temp, fns_ptr, method_oload_champ,
-                                           basetype, boffset);
+         if (TYPE_FN_FIELD_VIRTUAL_P (fns_ptr, method_oload_champ)
+             && noside != EVAL_AVOID_SIDE_EFFECTS)
+           {
+             *valp = value_virtual_fn_field (&temp, fns_ptr,
+                                             method_oload_champ, basetype,
+                                             boffset);
+           }
          else
            *valp = value_fn_field (&temp, fns_ptr, method_oload_champ,
                                    basetype, boffset);