From: Jason Merrill <jason@redhat.com>
Date: Sat, 8 Aug 2015 22:01:12 +0000 (-0400)
Subject: re PR libstdc++/67114 ([MinGW64] build failure with POSIX threads enabled)
X-Git-Tag: basepoints/gcc-7~5184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2dfb563745d1b0be669f49e37f6b7d56ee65991;p=thirdparty%2Fgcc.git

re PR libstdc++/67114 ([MinGW64] build failure with POSIX threads enabled)

	PR c++/67114
	* call.c (joust): Only call more_constrained on decls.

From-SVN: r226736
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a50804ae14b0..40ed123c961c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-08  Jason Merrill  <jason@redhat.com>
+
+	PR c++/67114
+	* call.c (joust): Only call more_constrained on decls.
+
 2015-08-06  Andrew Sutton  <andrew.n.sutton@gmail.com>
 	    Braden Obrzut  <admin@maniacsvault.net>
 	    Jason Merrill  <jason@redhat.com>
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4823d37a9c40..19ddb91e08fc 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -9157,14 +9157,14 @@ joust (struct z_candidate *cand1, struct z_candidate *cand2, bool warn,
 	return winner;
     }
 
-    // C++ Concepts
-    // or, if not that, F1 is more constrained than F2.
-    if (flag_concepts)
-      {
-        winner = more_constrained (cand1->fn, cand2->fn);
-        if (winner)
-          return winner;
-      }
+  // C++ Concepts
+  // or, if not that, F1 is more constrained than F2.
+  if (flag_concepts && DECL_P (cand1->fn) && DECL_P (cand2->fn))
+    {
+      winner = more_constrained (cand1->fn, cand2->fn);
+      if (winner)
+	return winner;
+    }
 
   /* Check whether we can discard a builtin candidate, either because we
      have two identical ones or matching builtin and non-builtin candidates.
diff --git a/gcc/testsuite/g++.dg/cpp1z/regress1.C b/gcc/testsuite/g++.dg/cpp1z/regress1.C
new file mode 100644
index 000000000000..bbcca083ede5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/regress1.C
@@ -0,0 +1,19 @@
+// PR c++/67114
+// { dg-options -std=c++1z }
+
+typedef unsigned uint32_t;
+class A {
+public:
+  void operator==(A);
+  operator uint32_t() const;
+  operator int() const;
+};
+class BluetoothNamedValue {
+  bool operator==(const BluetoothNamedValue &) const;
+  A value() const;
+};
+auto BluetoothNamedValue::
+operator==(const BluetoothNamedValue &) const -> bool {
+  value() == value();
+  return true;
+}