overloaded_operator_p

1 files changed, 2 insertions, 5 deletions

diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 0091fcf05b4..8b20d48dfe3 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -806,12 +806,9 @@ check_for_logical_overloads (tree t)
   if (TREE_CODE (fn) != FUNCTION_DECL)
     return false;
 
-  tree name = DECL_NAME (fn);
-  if ((name == operator_name_info [TRUTH_ANDIF_EXPR].identifier)
-      || (name == operator_name_info [TRUTH_ORIF_EXPR].identifier))
+  if (DECL_OVERLOADED_OPERATOR_P (fn))
     {
-      location_t loc =
-        EXPR_HAS_LOCATION (t) ? EXPR_LOCATION (t) : input_location;
+      location_t loc = EXPR_LOC_OR_LOC (t, input_location);
       error_at (loc, "constraint %qE, uses overloaded operator", t);
       return true;
     }