2011-05-18 Pedro Alves <pedro@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / macroscope.c

diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index 844e2e5b298f8625fef4e95d7402bf163333a7c0..b529e68c1fd102e88a299ebd43816856ca9986ed 100644 (file)
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -1,5 +1,6 @@
 /* Functions for deciding which macros are currently in scope.
-   Copyright (C) 2002, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
@@ -101,12 +102,13 @@ default_macro_scope (void)
   struct symtab_and_line sal;
   struct macro_scope *ms;
   struct frame_info *frame;
+  CORE_ADDR pc;
 
   /* If there's a selected frame, use its PC.  */
   frame = deprecated_safe_get_selected_frame ();
-  if (frame)
-    sal = find_pc_line (get_frame_pc (frame), 0);
-  
+  if (frame && get_frame_pc_if_available (frame, &pc))
+    sal = find_pc_line (pc, 0);
+
   /* Fall back to the current listing position.  */
   else
     {