From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 28 Jul 2010 18:00:02 +0000 (+0000)
Subject:         * breakpoint.c (breakpoint_re_set_one): Move call to set_language
X-Git-Tag: gdb_7_2-2010-09-02-release~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5558dfa390281ff15ca919f605272fa501288ae;p=thirdparty%2Fbinutils-gdb.git

    * 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 9ffabc02c90..3d7090a9d89 100644
--- 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 4affe0a7772..6a6864cf333 100644
--- 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)