From 1bb9788dbb7f4c729acc0d5096d05d501a415824 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 27 Jun 2012 18:08:41 +0000 Subject: PR macros/7961: * varobj.c (varobj_create): Update. (varobj_set_value): Update. * tracepoint.c (validate_actionline): Update. (encode_actions_1): Update. * parse.c (parse_exp_1): Add 'pc' argument. (parse_exp_in_context): Add 'pc' argument. Change how expression_context_pc is set. (parse_expression): Update. (parse_field_expression): Update. * expression.h (parse_exp_1): Update. * eval.c (parse_to_comma_and_eval): Update. * breakpoint.c (set_breakpoint_condition): Update. (update_watchpoint): Update. (init_breakpoint_sal): Update (find_condition_and_thread): Update. (watch_command_1): Update. (update_breakpoint_locations): Update. * ada-lang.c (ada_read_renaming_var_value): Update. (create_excep_cond_exprs): Update. testsuite * gdb.base/macscp1.c (macscp_expr): Add breakpoint comment. * gdb.base/macscp.exp (maybe_kfail): Add test for macro scope. --- gdb/ada-lang.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7afcef8..aa090af 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4060,7 +4060,7 @@ ada_read_renaming_var_value (struct symbol *renaming_sym, sym_name = xstrdup (SYMBOL_LINKAGE_NAME (renaming_sym)); old_chain = make_cleanup (xfree, sym_name); - expr = parse_exp_1 (&sym_name, block, 0); + expr = parse_exp_1 (&sym_name, 0, block, 0); make_cleanup (free_current_contents, &expr); value = evaluate_expression (expr); @@ -11140,7 +11140,8 @@ create_excep_cond_exprs (struct ada_catchpoint *c) s = cond_string; TRY_CATCH (e, RETURN_MASK_ERROR) { - exp = parse_exp_1 (&s, block_for_pc (bl->address), 0); + exp = parse_exp_1 (&s, bl->address, + block_for_pc (bl->address), 0); } if (e.reason < 0) warning (_("failed to reevaluate internal exception condition " -- cgit v1.1