call.c (joust): cp_pedwarn when using gnu extension concerning worst conversion seque...

cp:
	* call.c (joust): cp_pedwarn when using gnu extension concerning
	worst conversion sequences.
testsuite:
	* g++.old-deja/g++.ext/overload1.C: New test.

From-SVN: r40182

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 41a7a0681efc1543a2827a3dd2803206aa467245..78899b633a249997a2ae41a8e947738a8a6122db 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-02  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * call.c (joust): cp_pedwarn when using gnu extension concerning
+       worst conversion sequences.
+
 2001-03-01  Zack Weinberg  <zackw@stanford.edu>
 
        * decl.c: Replace all uses of 'boolean' with 'bool'.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index a9af4027f786a901a34b7b0cb8cec484416c1cc7..69c58db2d43e7787c526543a2bd520403c94d355 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5312,6 +5312,7 @@ tweak:
   if (!pedantic)
     {
       int rank1 = IDENTITY_RANK, rank2 = IDENTITY_RANK;
+      struct z_candidate *w, *l;
 
       for (i = 0; i < len; ++i)
        {
@@ -5320,11 +5321,22 @@ tweak:
          if (ICS_RANK (TREE_VEC_ELT (cand2->convs, i+off2)) > rank2)
            rank2 = ICS_RANK (TREE_VEC_ELT (cand2->convs, i+off2));
        }
-
       if (rank1 < rank2)
-       return 1;
+       winner = 1, w = cand1, l = cand2;
       if (rank1 > rank2)
-       return -1;
+       winner = -1, w = cand2, l = cand1;
+      if (winner)
+        {
+         if (warn)
+           {
+             cp_pedwarn ("choosing `%D' over `%D'", w->fn, l->fn);
+             cp_pedwarn (
+"  because worst conversion for the former is better than worst conversion for the latter");
+           }
+         else
+           add_warning (w, l);
+          return winner;
+        }
     }
 
   my_friendly_assert (!winner, 20010121);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a1a3ecaf408f27a76e352cb23ee01507c52408c..6c43b68b00ef6acf34eb7bfda95f4008c83f5711 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-02  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * g++.old-deja/g++.ext/overload1.C: New test.
+
 2001-03-01  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.old-deja/g++.pt/using1.C: New test.

diff --git a/gcc/testsuite/g++.old-deja/g++.ext/overload1.C b/gcc/testsuite/g++.old-deja/g++.ext/overload1.C
new file mode 100644 (file)
index 0000000..d99e04f
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.ext/overload1.C
@@ -0,0 +1,20 @@
+// Build don't link:
+// Special g++ Options: -fpermissive
+
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 28 Feb 2001 <nathan@codesourcery.com>
+
+// Make sure we warn about our overload extension about picking the
+// one with the least worse conversion
+
+struct X
+{
+  X (int);
+};
+void Foo (int, float, bool);
+void Foo (float, int, X);
+
+void Baz ()
+{
+  Foo (1, 1, 0);    // WARNING - least worse
+}