@@ -1854,10 +1856,11 @@ If you continue, the return value that y
if (return_value != NULL)
{
struct type *return_type = value_type (return_value);
- gdb_assert (gdbarch_return_value (current_gdbarch, return_type,
+ gdb_assert (gdbarch_return_value (get_frame_arch (get_current_frame ()),
+ return_type,
NULL, NULL, NULL)
== RETURN_VALUE_REGISTER_CONVENTION);
- gdbarch_return_value (current_gdbarch, return_type,
+ gdbarch_return_value (get_frame_arch (get_current_frame ()), return_type,
get_current_regcache (), NULL /*read*/,
value_contents (return_value) /*write*/);
}
At this point, there's no need to involve get_current_frame. The
routine operates on the current regcache, and should simply consult
its architecture.