From 7c0a61870e0f8fe8ad1e21594f92ab454ca60c0d Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 11 Dec 2019 11:48:44 -0500
Subject: [PATCH] PR c++/92859 - ADL and bit-field.

We also need unlowered_expr_type when considering associated types for ADL.

	* name-lookup.c: Use unlowered_expr_type.

From-SVN: r279229
---
 gcc/cp/ChangeLog                           |  3 +++
 gcc/cp/name-lookup.c                       |  2 +-
 gcc/testsuite/g++.dg/overload/bit-field1.C | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/overload/bit-field1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad08ff00e383..4cb79b2c24ea 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2019-12-11  Jason Merrill  <jason@redhat.com>
 
+	PR c++/92859 - ADL and bit-field.
+	* name-lookup.c: Use unlowered_expr_type.
+
 	PR c++/92446 - deduction of class NTTP.
 	* pt.c (deducible_expression): Look through VIEW_CONVERT_EXPR.
 
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index e82eaf222c02..e64cd9a9d66e 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -908,7 +908,7 @@ name_lookup::adl_expr (tree expr)
 
   if (TREE_TYPE (expr) != unknown_type_node)
     {
-      adl_type (TREE_TYPE (expr));
+      adl_type (unlowered_expr_type (expr));
       return;
     }
 
diff --git a/gcc/testsuite/g++.dg/overload/bit-field1.C b/gcc/testsuite/g++.dg/overload/bit-field1.C
new file mode 100644
index 000000000000..318caaaeb657
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/bit-field1.C
@@ -0,0 +1,18 @@
+// PR c++/92859
+// { dg-do compile { target c++11 } }
+
+void f(int) = delete;
+
+struct ES { 
+  enum E { v }; 
+  friend void f(E) { }
+};
+
+struct S {
+  ES::E e : 1; 
+};
+
+int main() {
+  S s{}; 
+  f (s.e);
+}
-- 
2.39.2