Remove -fdeduce-init-list.

From-SVN: r275387

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be92d37455ed1fe54d5bc04e398439d4bd681ba8..0f4b61da6b826107dd6c310aa43aef8601811643 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-04  Marek Polacek  <polacek@redhat.com>
+
+       * doc/invoke.texi: Remove -fdeduce-init-list documentation.
+
 2019-09-04  Uroš Bizjak  <ubizjak@gmail.com>
 
        PR target/32413

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index ecdaaeba645c8a27002a3c2926f4ddd032d9f5af..2720e6453f5c26f02ce6ee45d400b9cf6b91386c 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-04  Marek Polacek  <polacek@redhat.com>
+
+       * c.opt (fdeduce-init-list): Ignored.
+
 2019-09-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
        PR c/78736

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 38a8e7d1d12af5e1b7b8739130fedb2d26dea215..143833d90043046ae2094a0d8a9f26c392c93d88 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1460,8 +1460,8 @@ C ObjC C++ ObjC++
 Emit debug annotations during preprocessing.
 
 fdeduce-init-list
-C++ ObjC++ Var(flag_deduce_init_list) Init(0)
--fdeduce-init-list     enable deduction of std::initializer_list for a template type parameter from a brace-enclosed initializer-list.
+C++ ObjC++ Ignore
+Does nothing.  Preserved for backward compatibility.
 
 fdeclone-ctor-dtor
 C++ ObjC++ Var(flag_declone_ctor_dtor) Init(-1)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8eb81c5027a4fb088a54744c9ea427f72a4a35fe..605b3d72e5f919c894268efb60e92e6b0f7a222f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-04  Marek Polacek  <polacek@redhat.com>
+
+       * call.c (build_over_call): Remove -fdeduce-init-list implementation.
+       * pt.c (unify): Likewise.
+
 2019-09-01  Marek Polacek  <polacek@redhat.com>
 
        PR c++/91129 - wrong error with binary op in template argument.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 01a25ad6e1e703792aade1084291282abc3485c8..c3045d948c5b5ead85299cc833c6c8c476dbc415 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -8337,38 +8337,6 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
           && !(flags & LOOKUP_EXPLICIT_TMPL_ARGS))
         conversion_warning = false;
 
-      /* Warn about initializer_list deduction that isn't currently in the
-        working draft.  */
-      if (cxx_dialect > cxx98
-         && flag_deduce_init_list
-         && cand->template_decl
-         && is_std_init_list (non_reference (type))
-         && BRACE_ENCLOSED_INITIALIZER_P (arg))
-       {
-         tree tmpl = TI_TEMPLATE (cand->template_decl);
-         tree realparm = chain_index (j, DECL_ARGUMENTS (cand->fn));
-         tree patparm = get_pattern_parm (realparm, tmpl);
-         tree pattype = TREE_TYPE (patparm);
-         if (PACK_EXPANSION_P (pattype))
-           pattype = PACK_EXPANSION_PATTERN (pattype);
-         pattype = non_reference (pattype);
-
-         if (TREE_CODE (pattype) == TEMPLATE_TYPE_PARM
-             && (cand->explicit_targs == NULL_TREE
-                 || (TREE_VEC_LENGTH (cand->explicit_targs)
-                     <= TEMPLATE_TYPE_IDX (pattype))))
-           {
-             pedwarn (input_location, 0, "deducing %qT as %qT",
-                      non_reference (TREE_TYPE (patparm)),
-                      non_reference (type));
-             pedwarn (DECL_SOURCE_LOCATION (cand->fn), 0,
-                      "  in call to %qD", cand->fn);
-             pedwarn (input_location, 0,
-                      "  (you can disable this with "
-                      "%<-fno-deduce-init-list%>)");
-           }
-       }
-
       /* Set user_conv_p on the argument conversions, so rvalue/base handling
         knows not to allow any more UDCs.  This needs to happen after we
         process cand->warnings.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 187f9d857bc09254cb547e9848f326035bbb7020..15cc4b20a41ad85d3fb432e0de7b4628d1680051 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -22073,11 +22073,6 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict,
       unsigned i;
       tree orig_parm = parm;
 
-      /* Replace T with std::initializer_list<T> for deduction.  */
-      if (TREE_CODE (parm) == TEMPLATE_TYPE_PARM
-         && flag_deduce_init_list)
-       parm = listify (parm);
-
       if (!is_std_init_list (parm)
          && TREE_CODE (parm) != ARRAY_TYPE)
        /* We can only deduce from an initializer list argument if the

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 34d07463e2322a1264736ddcba3de229898481cb..fad19dd75d1741bd004f8d7149a1e6bfff6ce84a 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -2550,28 +2550,6 @@ of a loop too many expressions need to be evaluated, the resulting constexpr
 evaluation might take too long.
 The default is 33554432 (1<<25).
 
-@item -fdeduce-init-list
-@opindex fdeduce-init-list
-Enable deduction of a template type parameter as
-@code{std::initializer_list} from a brace-enclosed initializer list, i.e.@:
-
-@smallexample
-template <class T> auto forward(T t) -> decltype (realfn (t))
-@{
-  return realfn (t);
-@}
-
-void f()
-@{
-  forward(@{1,2@}); // call forward<std::initializer_list<int>>
-@}
-@end smallexample
-
-This deduction was implemented as a possible extension to the
-originally proposed semantics for the C++11 standard, but was not part
-of the final standard, so it is disabled by default.  This option is
-deprecated, and may be removed in a future version of G++.
-
 @item -fno-elide-constructors
 @opindex fno-elide-constructors
 @opindex felide-constructors

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5b6332a6a000b5f36200f24da32da2ff4252d05c..ecde4ca1c93617bf27f49688f9834d4b7fc82363 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-04  Marek Polacek  <polacek@redhat.com>
+
+       * g++.dg/cpp0x/initlist-deduce.C: Don't use -fdeduce-init-list.  Remove
+       dg-warning.  Add dg-error.
+
 2019-09-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
        PR c/78736

diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
index 6ae32a6c55df095eab8b20419a96af33c15d72d3..59d98ef6ddaa8b47bfbba6cfcad9538dacbbd8f2 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
@@ -1,9 +1,4 @@
-// Test for deduction of T as std::initializer_list.  This isn't currently
-// supported by the working draft, but is necessary for perfect forwarding
-// of initializer-lists to things that can take a std::initializer_list.
-
-// { dg-options "-fdeduce-init-list" }
-// { dg-do run { target c++11 } }
+// { dg-do compile { target c++11 } }
 
 #include <initializer_list>
 
@@ -15,14 +10,13 @@ struct A
 void f (A a) { }
 
 template <class T>
-auto g (T&& t) -> decltype (f(t)) // { dg-warning "call" }
+auto g (T&& t) -> decltype (f(t))
 {
   return f(t);
 }
 
 int main()
 {
-  g({1});                      // { dg-warning "deduc" }
+  g({1});                      // { dg-error "no matching function" }
 }
 
-// { dg-prune-output "-fno-deduce-init-list" }