1 files changed, 14 insertions, 10 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 5b03fa48c3..c61d666c4b 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -1785,16 +1785,20 @@ void Sema::ArgumentDependentLookup(DeclarationName Name, bool Operator,
           continue;
       }
 
-      // FIXME: using decls?  canonical decls?
-
-      FunctionDecl *Fn;
-      if (!Operator || !(Fn = dyn_cast<FunctionDecl>(D)) ||
-          IsAcceptableNonMemberOperatorCandidate(Fn, T1, T2, Context)) {
-        if (isa<FunctionDecl>(D))
-          Functions.insert(D);
-        else if (isa<FunctionTemplateDecl>(D))
-          Functions.insert(D);
-      }
+      if (isa<UsingShadowDecl>(D))
+        D = cast<UsingShadowDecl>(D)->getTargetDecl();
+
+      // FIXME: canonical decls.
+      // See comment in AddArgumentDependentLookupCandidates().
+
+      if (isa<FunctionDecl>(D)) {
+        if (Operator &&
+            !IsAcceptableNonMemberOperatorCandidate(cast<FunctionDecl>(D),
+                                                    T1, T2, Context))
+          continue;
+        Functions.insert(D);
+      } else if (isa<FunctionTemplateDecl>(D))
+        Functions.insert(D);
     }
   }
 }