From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Thu, 21 Aug 2008 20:29:00 +0000 (+0000)
Subject: 	* findvar.c (locate_var_value): Do not call get_frame_arch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5045add04b998b68602ab49f04cbf3ca4d422d54;p=binutils-gdb.git

	* findvar.c (locate_var_value): Do not call get_frame_arch
	with a NULL frame argument.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 17215541506..43eddfc1e5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-21  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* findvar.c (locate_var_value): Do not call get_frame_arch
+	with a NULL frame argument.
+
 2008-08-21  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* frame.h (frame_map_regnum_to_name): Remove prototype.
diff --git a/gdb/findvar.c b/gdb/findvar.c
index e67a66623a3..a39c8ff7eef 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -660,7 +660,7 @@ address_from_register (struct type *type, int regnum, struct frame_info *frame)
 struct value *
 locate_var_value (struct symbol *var, struct frame_info *frame)
 {
-  struct gdbarch *gdbarch = get_frame_arch (frame);
+  struct gdbarch *gdbarch;
   CORE_ADDR addr = 0;
   struct type *type = SYMBOL_TYPE (var);
   struct value *lazy_value;
@@ -686,6 +686,8 @@ locate_var_value (struct symbol *var, struct frame_info *frame)
   switch (VALUE_LVAL (lazy_value))
     {
     case lval_register:
+      gdb_assert (frame);
+      gdbarch = get_frame_arch (frame);
       gdb_assert (gdbarch_register_name
 		   (gdbarch, VALUE_REGNUM (lazy_value)) != NULL
 		  && *gdbarch_register_name