From 79e1a869ac109293fb60c1909c085ea8c6c7cd12 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 18 Mar 2011 18:43:33 +0000 Subject: [PATCH] gdb/ * dwarf2loc.c (dwarf2_evaluate_loc_desc): Catch NOT_AVAILABLE_ERROR when evaluating the location expression. --- gdb/dwarf2loc.c | 18 +++++++++++++++++- gdb/testsuite/ChangeLog | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index 285081e472..9fd8df04ab 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -1076,6 +1076,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame, struct dwarf_expr_context *ctx; struct cleanup *old_chain; struct objfile *objfile = dwarf2_per_cu_objfile (per_cu); + volatile struct gdb_exception ex; if (byte_offset < 0) invalid_synthetic_pointer (); @@ -1106,7 +1107,22 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame, ctx->get_tls_address = dwarf_expr_tls_address; ctx->dwarf_call = dwarf_expr_dwarf_call; - dwarf_expr_eval (ctx, data, size); + TRY_CATCH (ex, RETURN_MASK_ERROR) + { + dwarf_expr_eval (ctx, data, size); + } + if (ex.reason < 0) + { + if (ex.error == NOT_AVAILABLE_ERROR) + { + retval = allocate_value (type); + mark_value_bytes_unavailable (retval, 0, TYPE_LENGTH (type)); + return retval; + } + else + throw_exception (ex); + } + if (ctx->num_pieces > 0) { struct piece_closure *c; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5984d2dfdd..8bb59b6291 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-03-18 Pedro Alves + + * dwarf2loc.c (dwarf2_evaluate_loc_desc): Catch + NOT_AVAILABLE_ERROR when evaluating the location expression. + 2011-03-18 Pedro Alves * dwarf2loc.c (read_pieced_value): Handle get_frame_register_bytes