diff --git a/gdb/testsuite/gdb.cp/non-trivial-retval.cc b/gdb/testsuite/gdb.cp/non-trivial-retval.cc
new file mode 100644
index 0000000..c7a2d35
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/non-trivial-retval.cc
@@ -0,0 +1,73 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2014 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/>.  */
+
+class A
+{
+public:
+  A () {}
+  A (A &obj);
+
+  int a;
+};
+
+A::A(A &obj)
+{
+  a = obj.a;
+}
+
+A
+f1 (int i1, int i2)
+{
+  A a;
+
+  a.a = i1 + i2;
+
+  return a;
+}
+
+class B
+{
+public:
+  B () {}
+  B (const B &obj);
+
+  int b;
+};
+
+B::B(const B &obj)
+{
+  b = obj.b;
+}
+
+B
+f2 (int i1, int i2)
+{
+  B b;
+
+  b.b = i1 + i2;
+
+  return b;
+}
+
+int
+main (void)
+{
+  int i1 = 1;
+  int i2 = 10;
+
+  return 0;  /* Break here  */
+}
diff --git a/gdb/testsuite/gdb.cp/non-trivial-retval.exp b/gdb/testsuite/gdb.cp/non-trivial-retval.exp
new file mode 100644
index 0000000..a629339
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/non-trivial-retval.exp
@@ -0,0 +1,34 @@
+# Copyright 2014 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/>.
+
+# This file is part of the gdb testsuite
+
+if {[skip_cplus_tests]} { continue }
+
+standard_testfile .cc
+
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
+}
+
+if {![runto_main]} {
+    return -1
+}
+
+gdb_breakpoint [gdb_get_line_number "Break here"]
+gdb_continue_to_breakpoint "Break here"
+
+gdb_test "p f1 (i1, i2)" ".*a = 11.*" "p f1 (i1, i2)"
+gdb_test "p f2 (i1, i2)" ".*b = 11.*" "p f2 (i1, i2)"