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, 20 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/conversion/cond3.C b/gcc/testsuite/g++.dg/conversion/cond3.C
new file mode 100644
index 000000000..da052d453
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/cond3.C
@@ -0,0 +1,20 @@
+// PR c++/9537
+
+class String
+{
+public:
+    String();
+    String( char *str );
+    operator char *();
+};
+
+const String operator+( String s1, String )
+{
+  return s1;
+}
+
+String valGlue(const String before)
+{
+    String ret;
+    return false ? ret : before + before;
+}