obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 48 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/opt/nrv10.C b/gcc/testsuite/g++.dg/opt/nrv10.C
new file mode 100644
index 000000000..d4cb92c33
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/nrv10.C
@@ -0,0 +1,48 @@
+// PR c++/25979
+// Bug: we were eliding too many temporaries, so that a1 was used
+// as both 'a' and 'x' in the second operator+.
+// { dg-do run }
+
+struct A
+{
+    A() : data1_(0), data2_(0) {}
+    A(int i, int j) : data1_(i), data2_(j) {}
+    A operator+(int);
+    friend A operator+(int, const A&);
+    ~A() {}
+//private:
+    int data1_;
+    int data2_;
+};
+
+extern bool x;
+
+extern "C" void abort ();
+
+int main()
+{
+    A a1(1,2);
+    a1 = (x ? a1 + 3 : 3 + a1);
+    if (a1.data1_ != 3 || a1.data2_ != 2)
+      abort ();
+}
+
+bool x = false;
+
+A
+A::operator+(int i)
+{
+    A a;
+    a = *this;
+    a.data2_ = i;
+    return a;
+}
+
+A
+operator+(int i, const A& x)
+{
+    A a;
+    a = x;
+    a.data1_ = i;
+    return a;
+}