Scope: make sure SymbolDatabase is being provided

Author: firewave

lib/clangimport.cpp

@@ -658,14 +658,13 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType
 
     auto *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
 
-    symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nestedIn);
+    symbolDatabase->scopeList.emplace_back(nestedIn->symdb, nullptr, nestedIn);
     Scope *scope = &symbolDatabase->scopeList.back();
     if (scopeType == Scope::ScopeType::eEnum)
         scope->enumeratorList.reserve(children2.size());
     nestedIn->nestedList.push_back(scope);
     scope->type = scopeType;
-    scope->classDef = def;
-    scope->symdb = nestedIn->symdb;
+    scope->classDef = def; // TODO: pass into ctor
     if (Token::Match(def, "if|for|while (")) {
         std::map<const Variable *, const Variable *> replaceVar;
         for (const Token *vartok = def->tokAt(2); vartok; vartok = vartok->next()) {
@@ -1361,11 +1360,10 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
 
     Scope *scope = nullptr;
     if (hasBody) {
-        symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nestedIn);
+        symbolDatabase->scopeList.emplace_back(symbolDatabase, nullptr, nestedIn);
         scope = &symbolDatabase->scopeList.back();
-        scope->symdb = symbolDatabase;
         scope->function = function;
-        scope->classDef = nameToken;
+        scope->classDef = nameToken; // TODO: pass into ctor
         scope->type = Scope::ScopeType::eFunction;
         scope->className = nameToken->str();
         nestedIn->nestedList.push_back(scope);
@@ -1577,9 +1575,8 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
 
     tokenizer.createSymbolDatabase();
     auto *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase());
-    symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nullptr);
+    symbolDatabase->scopeList.emplace_back(symbolDatabase, nullptr, nullptr);
     symbolDatabase->scopeList.back().type = Scope::ScopeType::eGlobal;
-    symbolDatabase->scopeList.back().symdb = symbolDatabase;
 
     clangimport::Data data;
     data.mSettings = &tokenizer.getSettings();

lib/symboldatabase.cpp

@@ -4412,17 +4412,17 @@ void SymbolDatabase::printXml(std::ostream &out) const
 
 //---------------------------------------------------------------------------
 
-static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase* symbolDatabase, const Scope* scope, const Token* typeTok)
+static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase& symbolDatabase, const Scope* scope, const Token* typeTok)
 {
-    const Type* argType = symbolDatabase->findVariableType(scope, typeTok);
+    const Type* argType = symbolDatabase.findVariableType(scope, typeTok);
     if (argType)
         return argType;
 
     // look for variable type in any using namespace in this scope or above
     while (scope) {
         for (const Scope::UsingInfo &ui : scope->usingList) {
             if (ui.scope) {
-                argType = symbolDatabase->findVariableType(ui.scope, typeTok);
+                argType = symbolDatabase.findVariableType(ui.scope, typeTok);
                 if (argType)
                     return argType;
             }
@@ -4523,7 +4523,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
 
         const ::Type *argType = nullptr;
         if (!typeTok->isStandardType()) {
-            argType = findVariableTypeIncludingUsedNamespaces(symbolDatabase, scope, typeTok);
+            argType = findVariableTypeIncludingUsedNamespaces(*symbolDatabase, scope, typeTok);
 
             // save type
             const_cast<Token *>(typeTok)->type(argType);
@@ -4722,6 +4722,7 @@ Scope::Scope(const SymbolDatabase *symdb_, const Token *classDef_, const Scope *
     nestedIn(nestedIn_),
     type(type_)
 {
+    assert(symdb_);
     setBodyStartEnd(start_);
 }
 
@@ -4730,6 +4731,8 @@ Scope::Scope(const SymbolDatabase *symdb_, const Token *classDef_, const Scope *
     classDef(classDef_),
     nestedIn(nestedIn_)
 {
+    assert(symdb_);
+
     const Token *nameTok = classDef;
     if (!classDef) {
         type = Scope::eGlobal;
@@ -4977,7 +4980,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
         const Type *vType = nullptr;
 
         if (typetok) {
-            vType = findVariableTypeIncludingUsedNamespaces(symdb, this, typetok);
+            vType = findVariableTypeIncludingUsedNamespaces(*symdb, this, typetok);
 
             const_cast<Token *>(typetok)->type(vType);
         }