diff --git a/gdb/stack.c b/gdb/stack.c
index 4a92449e284..6f986aa8297 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2863,9 +2863,11 @@ find_frame_for_function (const char *function_name)
 
   do
     {
+      CORE_ADDR frame_pc = get_frame_address_in_block (frame);
+
       for (size_t i = 0; (i < sals.size () && !found); i++)
-	found = (get_frame_pc (frame) >= func_bounds[i].low
-		 && get_frame_pc (frame) < func_bounds[i].high);
+	found = (frame_pc >= func_bounds[i].low
+		 && frame_pc < func_bounds[i].high);
       if (!found)
 	{
 	  level = 1;
diff --git a/gdb/testsuite/gdb.base/frame-selection.c b/gdb/testsuite/gdb.base/frame-selection.c
index 237e155b8c5..18a58e44e3f 100644
--- a/gdb/testsuite/gdb.base/frame-selection.c
+++ b/gdb/testsuite/gdb.base/frame-selection.c
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include <stdlib.h>
+
 int
 frame_2 (void)
 {
@@ -40,6 +42,23 @@ recursive (int arg)
   return v;
 }
 
+/* A function that never returns.  */
+void __attribute__((noreturn))
+func_that_never_returns (void)
+{
+  exit (0);
+}
+
+/* A function that tail calls.  Calling a 'noreturn' function isn't
+   required for a tail call, but at low optimisation levels, gcc will apply
+   the tail call optimisation only for 'noreturn' calls.  */
+
+void
+func_that_tail_calls (void)
+{
+  func_that_never_returns ();
+}
+
 int
 main (void)
 {
@@ -48,5 +67,7 @@ main (void)
   i = frame_1 ();
   j = recursive (0);
 
+  func_that_tail_calls ();
+
   return i + j;
 }
diff --git a/gdb/testsuite/gdb.base/frame-selection.exp b/gdb/testsuite/gdb.base/frame-selection.exp
index e8d9c87c3a8..32ed92d2439 100644
--- a/gdb/testsuite/gdb.base/frame-selection.exp
+++ b/gdb/testsuite/gdb.base/frame-selection.exp
@@ -186,3 +186,40 @@ with_test_prefix "second frame_2 breakpoint" {
     gdb_test "frame function recursive" "#1  $hex in recursive.*" \
 	"select frame for function recursive, third attempt"
 }
+
+# At one point using the 'function' sub-command (e.g. 'frame function
+# ...') would fail to select a frame if the frame ended with a
+# tail-call, and the address within the frame was outside the bounds
+# of the function.
+with_test_prefix "stack with tail call" {
+    gdb_breakpoint func_that_never_returns
+    gdb_continue_to_breakpoint func_that_never_returns
+
+    gdb_test "bt" \
+	[multi_line \
+	     "#0  func_that_never_returns \\(\\) at \[^\r\n\]+" \
+	     "#1  $hex in func_that_tail_calls \\(\\) at \[^\r\n\]+" \
+	     "#2  $hex in main \\(\\) at \[^\r\n\]+"] \
+	"bt from func_that_never_returns"
+
+    # Reset the frame addresses based on the new stack.
+    gdb_test "frame 0" "#0  func_that_never_returns.*"
+    set frame_0_address [ get_frame_address "frame 0" ]
+    gdb_test "frame 1" "#1  $hex in func_that_tail_calls.*"
+    set frame_1_address [ get_frame_address "frame 1" ]
+    gdb_test "frame 2" "#2  $hex in main.*"
+    set frame_2_address [ get_frame_address "frame 2" ]
+
+    # Test 'select-frame function ...' command.
+    gdb_test_no_output "select-frame function func_that_never_returns"
+    check_frame "0" "${frame_0_address}" "func_that_never_returns"
+    gdb_test_no_output "select-frame function func_that_tail_calls"
+    check_frame "1" "${frame_1_address}" "func_that_tail_calls"
+    gdb_test_no_output "select-frame function main"
+    check_frame "2" "${frame_2_address}" "main"
+
+    # Test 'frame function ...' command.
+    gdb_test "frame function func_that_never_returns" "#0  func_that_never_returns.*"
+    gdb_test "frame function func_that_tail_calls" "#1  $hex in func_that_tail_calls.*"
+    gdb_test "frame function main" "#2  $hex in main.*"
+}