7 files changed, 143 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd04d7a..3c83d5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* dwarf2-frame.c (dwarf2_frame_cache): Use
+	get_frame_address_in_block instead of get_frame_pc as
+	the bound for executing the frame's FDE.
+
 2012-08-16  Yao Qi  <yao@codesourcery.com>
 
 	* gdbtypes.h (enum type_code): Define TYPE_CODE_BITSTRING -1.
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 986aaea..dcfbeb7 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -1065,7 +1065,8 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache)
 
   /* First decode all the insns in the CIE.  */
   execute_cfa_program (fde, fde->cie->initial_instructions,
-		       fde->cie->end, gdbarch, get_frame_pc (this_frame), fs);
+		       fde->cie->end, gdbarch,
+		       get_frame_address_in_block (this_frame), fs);
 
   /* Save the initialized register set.  */
   fs->initial = fs->regs;
@@ -1090,7 +1091,7 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache)
 
   /* Then decode the insns in the FDE up to our target PC.  */
   execute_cfa_program (fde, instr, fde->end, gdbarch,
-		       get_frame_pc (this_frame), fs);
+		       get_frame_address_in_block (this_frame), fs);
 
   TRY_CATCH (ex, RETURN_MASK_ERROR)
     {
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f15d8c7..9c80ecb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/rdv_wait: New testcase.
+
 2012-08-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/attach-twice.exp: Remove excessive ps exec.
diff --git a/gdb/testsuite/gdb.ada/rdv_wait.exp b/gdb/testsuite/gdb.ada/rdv_wait.exp
new file mode 100644
index 0000000..67e0f1e
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/rdv_wait.exp
@@ -0,0 +1,32 @@
+# Copyright 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+load_lib "ada.exp"
+
+standard_ada_testfile foo
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+  return -1
+}
+
+clean_restart ${testfile}
+
+runto "break_me"
+
+# Switch to task 2, and verify that GDB is able to unwind all the way
+# to foo.T.
+gdb_test "task 2" \
+         [join {"\\\[Switching to task 2\\\].*" \
+                ".*foo\\.t \\(.*\\).*foo\\.adb:.*"} ""]
diff --git a/gdb/testsuite/gdb.ada/rdv_wait/foo.adb b/gdb/testsuite/gdb.ada/rdv_wait/foo.adb
new file mode 100644
index 0000000..cc3c22c
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/rdv_wait/foo.adb
@@ -0,0 +1,53 @@
+--  Copyright 2012 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+with Pck; use Pck;
+
+procedure Foo is
+
+   task type T is
+      entry Finish;
+   end T;
+   type TA is access T;
+
+   task body T is
+   begin
+      --  Wait for up to 100 seconds for the Finish Rendez-Vous to occur.
+      select
+         accept Finish do
+            null;
+         end Finish;
+      or
+         delay 100.0;
+      end select;
+   end T;
+
+   MIT : TA;
+
+begin
+
+   --  Create a task, and give it some time to activate and then start
+   --  its execution.
+   MIT := new T;
+   delay 0.01;
+
+   --  Now, call our anchor. The task we just created should now be
+   --  blocked on a timed entry wait.
+   Break_Me;
+
+   --  Tell the task to finish before the 100 seconds are up.  The test
+   --  is now finished, no need to wait :).
+   MIT.Finish;
+end Foo;
diff --git a/gdb/testsuite/gdb.ada/rdv_wait/pck.adb b/gdb/testsuite/gdb.ada/rdv_wait/pck.adb
new file mode 100644
index 0000000..e5eebdc
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/rdv_wait/pck.adb
@@ -0,0 +1,23 @@
+--  Copyright 2012 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package body Pck is
+
+   procedure Break_Me is
+   begin
+      null;
+   end Break_Me;
+
+end Pck;
diff --git a/gdb/testsuite/gdb.ada/rdv_wait/pck.ads b/gdb/testsuite/gdb.ada/rdv_wait/pck.ads
new file mode 100644
index 0000000..afe98f7
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/rdv_wait/pck.ads
@@ -0,0 +1,22 @@
+--  Copyright 2012 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package Pck is
+
+   procedure Break_Me;
+   --  A procedure doing nothing, but which is a convenient anchor
+   --  for inserting breakpoints.
+
+end Pck;