* breakpoint.c (breakpoint_re_set_one): Move call to set_language

        down, just before the block that parse the breakpoint addr_string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9ffabc02c90b0385a8d4cfe1422eaf09d3bbae90..3d7090a9d899973a3d99d72a1caa784fe815037b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-28  Joel Brobecker  <brobecker@adacore.com>
+
+       * breakpoint.c (breakpoint_re_set_one): Move call to set_language
+       down, just before the block that parse the breakpoint addr_string.
+
 2010-07-28  CHENG Renquan  <rqcheng@smu.edu.sg>
 
        * cli/cli-cmds.c (disassemble_command): Add support of disassemble

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4affe0a777278abb6cc9b39f3f65e73317c642c5..6a6864cf333ca2ecdb2acf218faa1d5a9a6aafb4 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10010,7 +10010,6 @@ breakpoint_re_set_one (void *bint)
          return 0;
        }
 
-      set_language (b->language);
       input_radix = b->input_radix;
       s = b->addr_string;
 
@@ -10019,6 +10018,7 @@ breakpoint_re_set_one (void *bint)
 
       marker_spec = b->type == bp_static_tracepoint && is_marker_spec (s);
 
+      set_language (b->language);
       TRY_CATCH (e, RETURN_MASK_ERROR)
        {
          if (marker_spec)