[cfe-commits] r141878 - in /cfe/trunk/lib/Sema: Sema.cpp SemaExpr.cpp

[Douglas Gregor]

Author: dgregor
Date: Thu Oct 13 13:26:27 2011
New Revision: 141878

URL: http://llvm.org/viewvc/llvm-project?rev=141878&view=rev
Log:
HasFormOfMemberPointer implies IsAddressOfOperand for an overload set. Simplify

Modified:
    cfe/trunk/lib/Sema/Sema.cpp
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=141878&r1=141877&r2=141878&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.cpp (original)
+++ cfe/trunk/lib/Sema/Sema.cpp Thu Oct 13 13:26:27 2011
@@ -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;

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=141878&r1=141877&r2=141878&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Oct 13 13:26:27 2011
@@ -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);