When adding the underlying declaration of a decl to a lookup-results

set, expand overloaded function declarations. Long-term, this should
actually be done by the name-lookup code rather than here, but this
part of the code (involving using declarations) is getting a makeover
now and the test-case is useful.


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

2 files changed, 35 insertions, 1 deletions

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index b412882b85..d736dfbac5 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1212,7 +1212,20 @@ public:
 
     /// \brief Add a declaration to these results.
     void addDecl(NamedDecl *D) {
-      Decls.push_back(D->getUnderlyingDecl());
+      // "Flatten" overloaded function declarations to get the underlying
+      // functions.
+      // FIXME: This may not be necessary with the impending using-declarations
+      // rewrite (11/09).
+      if (OverloadedFunctionDecl *Ovl 
+            = dyn_cast<OverloadedFunctionDecl>(D->getUnderlyingDecl())) {
+        for (OverloadedFunctionDecl::function_iterator 
+               F = Ovl->function_begin(),
+               FEnd = Ovl->function_end();
+             F != FEnd; ++F) {
+          Decls.push_back(*F);
+        }
+      } else
+        Decls.push_back(D->getUnderlyingDecl());
       Kind = Found;
     }
 
diff --git a/test/SemaCXX/using-decl-1.cpp b/test/SemaCXX/using-decl-1.cpp
index 37e101e221..42deb27027 100644
--- a/test/SemaCXX/using-decl-1.cpp
+++ b/test/SemaCXX/using-decl-1.cpp
@@ -17,3 +17,24 @@ namespace N {
   
   void f(int) { } // expected-error{{redefinition}}
 }
+
+namespace N {
+  void f(double);
+  void f(long);
+}
+
+struct X0 {
+  void operator()(int);
+  void operator()(long);
+};
+
+struct X1 : X0 {
+  // FIXME: give this operator() a 'float' parameter to test overloading
+  // behavior. It currently fails.
+  void operator()();
+  using X0::operator();
+  
+  void test() {
+    (*this)(1);
+  }
+};