From 50531a2a1d82e41a39d0c85421b4e99802d6e349 Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@gmail.com>
Date: Fri, 23 Mar 2018 15:17:19 +0200
Subject: [PATCH] Implement P0962

* parser.c (cp_parser_perform_range_for_lookup): Change
the condition for deciding whether to use members.

From-SVN: r258803
---
 gcc/cp/ChangeLog                         |  6 +++++
 gcc/cp/parser.c                          |  2 +-
 gcc/testsuite/g++.dg/cpp0x/range-for13.C | 46 ++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b7e2846..e04eae1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-23  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Implement P0962
+	* parser.c (cp_parser_perform_range_for_lookup): Change
+	the condition for deciding whether to use members.
+
 2018-03-23  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/85033
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 602cc99..e946d0b 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12048,7 +12048,7 @@ cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end)
 				  /*protect=*/2, /*want_type=*/false,
 				  tf_warning_or_error);
 
-      if (member_begin != NULL_TREE || member_end != NULL_TREE)
+      if (member_begin != NULL_TREE && member_end != NULL_TREE)
 	{
 	  /* Use the member functions.  */
 	  if (member_begin != NULL_TREE)
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for13.C b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
index 9ed0458..7babd71 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
@@ -3,18 +3,6 @@
 
 // { dg-do compile { target c++11 } }
 
-//These should not be used
-template<typename T> int *begin(T &t)
-{
-    T::fail;
-    return 0;
-}
-template<typename T> int *end(T &t)
-{
-    T::fail;
-    return 0;
-}
-
 struct container1
 {
     int *begin();
@@ -89,10 +77,37 @@ struct container10
     static function end;
 };
 
+namespace N
+{
+template<typename T> int *begin(T &t)
+{
+    return 0;
+}
+template<typename T> int *end(T &t)
+{
+    return 0;
+}
+struct container11
+{
+    int *begin();
+    //no end
+};
+
+struct container12
+{
+    int *end();
+    //no begin
+};
+
+struct container13
+{
+};
+}
+
 void test1()
 {
-  for (int x : container1()); // { dg-error "member but not" }
-  for (int x : container2()); // { dg-error "member but not" }
+  for (int x : container1()); // { dg-error "'begin' was not declared|'end' was not declared" }
+  for (int x : container2()); // { dg-error "'begin' was not declared|'end' was not declared" }
   for (int x : container3()); // { dg-error "within this context" }
   for (int x : container4()); // { dg-error "cannot be used as a function" }
   for (int x : container5()); // { dg-error "invalid use of" }
@@ -101,4 +116,7 @@ void test1()
   for (int x : container8());
   for (int x : container9()); // { dg-error "within this context" }
   for (int x : container10());
+  for (int x : N::container11());
+  for (int x : N::container12());
+  for (int x : N::container13());
 }
-- 
2.7.4