commit 64a371ff8d525880e519a43fc522cbdc79fc4a89
author Douglas Gregor <dgregor@apple.com> Thu Oct 13 18:26:27 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Thu Oct 13 18:26:27 2011 +0000
tree f9d9fb50edf686ae9253957b268e218610359d7e
parent ee697e69a2063b65bfd0534248e4848461aca3f4

HasFormOfMemberPointer implies IsAddressOfOperand for an overload set. Simplify

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141878 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/Sema.cpp

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 7b9f590..533b21c 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -894,8 +894,8 @@
       }
     }
 
-    // Ignore overloads that are the pointer-to-member.
-    if (FR.IsAddressOfOperand && FR.HasFormOfMemberPointer)
+    // Ignore overloads that are pointer-to-member constants.
+    if (FR.HasFormOfMemberPointer)
       return false;
 
     return true;

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index bfe9849..3818e3d 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3550,7 +3550,7 @@
     OverloadExpr::FindResult find = OverloadExpr::find(Fn);
 
     // We aren't supposed to apply this logic for if there's an '&' involved.
-    if (!(find.IsAddressOfOperand && find.HasFormOfMemberPointer)) {
+    if (!find.HasFormOfMemberPointer) {
       OverloadExpr *ovl = find.Expression;
       if (isa<UnresolvedLookupExpr>(ovl)) {
         UnresolvedLookupExpr *ULE = cast<UnresolvedLookupExpr>(ovl);