* ada-lang.c (ensure_lval): Fix value lval kind.

        (convert_actual): Add handling for arguments passed by reference.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5adc048280d02700da0acb7a131dbea70f988ba3..b1a2c921cafac6742e05d6ad30df1286b2554a8a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-08  Paul Hilfinger  <hilfinger@adacore.com>
+
+       * ada-lang.c (ensure_lval): Fix value lval kind.
+       (convert_actual): Add handling for arguments passed by reference.
+
 2008-01-08  Doug Evans  <dje@google.com>
 
        * dbxread.c (read_dbx_symtab): Fix indentation.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index a689b2e04959a7c01662da2a21c6d51ea99fb772..2d1ce2f16254ff4dfeeb7afc1e09d27725c600f3 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3822,6 +3822,7 @@ ensure_lval (struct value *val, CORE_ADDR *sp)
          if (gdbarch_frame_align_p (current_gdbarch))
            *sp = gdbarch_frame_align (current_gdbarch, *sp);
        }
+      VALUE_LVAL (val) = lval_memory;
 
       write_memory (VALUE_ADDRESS (val), value_contents_raw (val), len);
     }
@@ -3850,11 +3851,13 @@ convert_actual (struct value *actual, struct type *formal_type0,
   if (ada_is_array_descriptor_type (formal_target)
       && TYPE_CODE (actual_target) == TYPE_CODE_ARRAY)
     return make_array_descriptor (formal_type, actual, sp);
-  else if (TYPE_CODE (formal_type) == TYPE_CODE_PTR)
+  else if (TYPE_CODE (formal_type) == TYPE_CODE_PTR
+          || TYPE_CODE (formal_type) == TYPE_CODE_REF)
     {
+      struct value *result;
       if (TYPE_CODE (formal_target) == TYPE_CODE_ARRAY
           && ada_is_array_descriptor_type (actual_target))
-        return desc_data (actual);
+       result = desc_data (actual);
       else if (TYPE_CODE (actual_type) != TYPE_CODE_PTR)
         {
           if (VALUE_LVAL (actual) != lval_memory)
@@ -3867,8 +3870,11 @@ convert_actual (struct value *actual, struct type *formal_type0,
                       TYPE_LENGTH (actual_type));
               actual = ensure_lval (val, sp);
             }
-          return value_addr (actual);
+          result = value_addr (actual);
         }
+      else
+       return actual;
+      return value_cast_pointers (formal_type, result);
     }
   else if (TYPE_CODE (actual_type) == TYPE_CODE_PTR)
     return ada_value_ind (actual);