From e4a70f87e67efaede1f118cdd99599920be9b415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 26 Jun 2018 11:38:45 +0200
Subject: [PATCH] SymbolDatabase: Improved lookup of function calls

---
 lib/symboldatabase.cpp      |  9 +++++++++
 test/testsymboldatabase.cpp | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 24e242ac5..b33003b84 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -4021,6 +4021,15 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
         }
     }
 
+    // using namespace..
+    for (const Scope *scope = this; scope; scope = scope->nestedIn) {
+        for (const UsingInfo &usingInfo : scope->usingList) {
+            const Function *func = usingInfo.scope->findFunction(tok,requireConst);
+            if (func)
+                matches.push_back(func);
+        }
+    }
+
     // check in base classes
     findFunctionInBase(tok->str(), args, matches);
 
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 0dafd2730..38d7eb092 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -325,6 +325,7 @@ private:
         TEST_CASE(findFunction18);
         TEST_CASE(findFunction19);
         TEST_CASE(findFunction20); // #8280
+        TEST_CASE(findFunction21); // #8592 - using namespace
 
         TEST_CASE(noexceptFunction1);
         TEST_CASE(noexceptFunction2);
@@ -5158,6 +5159,30 @@ private:
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12);
     }
 
+    void findFunction21() { // using namespace ..
+        {
+            GET_SYMBOL_DB("namespace NS { void f(); };\n"
+                          "void foo() {\n"
+                          "  using namespace NS;\n"
+                          "  f();\n"
+                          "}");
+            const Scope *foo = db->findScopeByName("foo");
+            const Token *ftok = Token::findsimplematch(foo->bodyStart, "f (");
+            ASSERT(foo->findFunction(ftok,false));
+        }
+
+        {
+            GET_SYMBOL_DB("namespace NS { void f(); };\n"
+                          "void foo() {\n"
+                          "  using namespace NS;\n"
+                          "  if (abc) { f(); }\n"
+                          "}");
+            const Scope *foo = db->findScopeByName("foo");
+            const Token *ftok = Token::findsimplematch(foo->bodyStart, "f (");
+            ASSERT(foo->findFunction(ftok,false));
+        }
+    }
+
 #define FUNC(x) const Function *x = findFunctionByName(#x, &db->scopeList.front()); \
                 ASSERT_EQUALS(true, x != nullptr);                                  \
                 if (x) ASSERT_EQUALS(true, x->isNoExcept());